diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-12-26 03:08:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-26 03:08:07 +0000 |
| commit | 842689cf1a33e2cb7932330f5e19c3c53bcae193 (patch) | |
| tree | ec95eaf0f5f7923e947f01016626de8ed09d5da3 | |
| parent | cefaeb2eb1b674bf06d662c3f4782147c1625976 (diff) | |
| parent | 537b35e1bb4c93292f842906be97341cf1276432 (diff) | |
| download | nextcloud-server-842689cf1a33e2cb7932330f5e19c3c53bcae193.tar.gz nextcloud-server-842689cf1a33e2cb7932330f5e19c3c53bcae193.zip | |
Merge pull request #24844 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.3
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json index 21febcc4708..003601189be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11002,9 +11002,9 @@ } }, "webpack-merge": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.2.tgz", - "integrity": "sha512-7o7qjwcIB6lqHX0VZA2Vxcp8RHftW1LNcaB6t87PEpco/VPlG0Wn9DnvgmcJ0nZU578/vKQfhDSLTF0EZ+pFAg==", + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", + "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index c9f9e1f16ce..8e9e4ad925d 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.44.2", "webpack-cli": "^4.2.0", - "webpack-merge": "^5.7.2", + "webpack-merge": "^5.7.3", "webpack-node-externals": "^2.5.2" }, "browserslist": [ |