aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-12-26 02:17:13 +0000
committerGitHub <noreply@github.com>2020-12-26 02:17:13 +0000
commit537b35e1bb4c93292f842906be97341cf1276432 (patch)
treedbcdc07f4a0a243c83f5ccf65eadd84161548d2a
parentc15b0b0250d177f0990f2df22a391966b8951483 (diff)
downloadnextcloud-server-537b35e1bb4c93292f842906be97341cf1276432.tar.gz
nextcloud-server-537b35e1bb4c93292f842906be97341cf1276432.zip
Bump webpack-merge from 5.7.2 to 5.7.3
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.7.2 to 5.7.3. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v5.7.2...v5.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
-rw-r--r--package-lock.json6
-rw-r--r--package.json2
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": [