diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-09-01 19:33:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-01 19:33:40 +0200 |
| commit | 4d696bc4bccd14b5793b12798dcfcd32f1ceba17 (patch) | |
| tree | 9f6e887889d83460e5a0e26f373490e801a2a4be | |
| parent | 582f0265c80d61fa72ff5cd5d646c1dd83815d07 (diff) | |
| parent | 5813136e84f7040c37a487a2dcc13c4629a1d41b (diff) | |
| download | nextcloud-server-4d696bc4bccd14b5793b12798dcfcd32f1ceba17.tar.gz nextcloud-server-4d696bc4bccd14b5793b12798dcfcd32f1ceba17.zip | |
Merge pull request #16952 from nextcloud/dependabot/npm_and_yarn/webpack-merge-4.2.2
Bump webpack-merge from 4.2.1 to 4.2.2
| -rw-r--r-- | package-lock.json | 8 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package-lock.json b/package-lock.json index 410eba109d8..c22cc8acb31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9239,12 +9239,12 @@ } }, "webpack-merge": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", - "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", + "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "^4.17.5" + "lodash": "^4.17.15" } }, "webpack-sources": { diff --git a/package.json b/package.json index 6e098d174e8..7529e3db82a 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "vue-template-compiler": "^2.6.10", "webpack": "^4.39.2", "webpack-cli": "^3.3.7", - "webpack-merge": "^4.2.1" + "webpack-merge": "^4.2.2" }, "browserslist": [ "extends browserslist-config-nextcloud" |