diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-01-06 16:02:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 16:02:26 +0100 |
| commit | 186b0699a830752090d59310cf784d837713c80e (patch) | |
| tree | 955e0367fe6f3de5c50d8df81819f973960f1486 /settings | |
| parent | 1789885410bcf152037f815b92d1197d284edd31 (diff) | |
| parent | be87dccc660cb78936ca85c75c12df513b3ffa8a (diff) | |
| download | nextcloud-server-186b0699a830752090d59310cf784d837713c80e.tar.gz nextcloud-server-186b0699a830752090d59310cf784d837713c80e.zip | |
Merge pull request #13390 from nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.2.1
Bump webpack-merge from 4.1.5 to 4.2.1 in /settings
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/package-lock.json | 6 | ||||
| -rw-r--r-- | settings/package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/settings/package-lock.json b/settings/package-lock.json index 8822e5f7492..816551d8aba 100644 --- a/settings/package-lock.json +++ b/settings/package-lock.json @@ -7892,9 +7892,9 @@ } }, "webpack-merge": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz", - "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", + "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/settings/package.json b/settings/package.json index c4426b93e44..57e2114dc43 100644 --- a/settings/package.json +++ b/settings/package.json @@ -43,6 +43,6 @@ "vue-template-compiler": "^2.5.21", "webpack": "^4.28.3", "webpack-cli": "^3.2.0", - "webpack-merge": "^4.1.5" + "webpack-merge": "^4.2.1" } } |