diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-12-21 08:21:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 08:21:33 +0000 |
| commit | d0fa143f01ce848de32bdb7d00cf7a6a9e2a6f5d (patch) | |
| tree | dcadff3d03ca0103ee193359b671d07f9efa7cf1 | |
| parent | 4973f9b952a6b2b7150283f3339a16e167807206 (diff) | |
| parent | 4629b31a0cd2691b1bc346439759c72ff9817fb6 (diff) | |
| download | nextcloud-server-d0fa143f01ce848de32bdb7d00cf7a6a9e2a6f5d.tar.gz nextcloud-server-d0fa143f01ce848de32bdb7d00cf7a6a9e2a6f5d.zip | |
Merge pull request #24773 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.2
| -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 ca6be9e7658..21febcc4708 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11002,9 +11002,9 @@ } }, "webpack-merge": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.6.1.tgz", - "integrity": "sha512-5n19s1YcyQkBJkYtE+Tq3br/Ax6ofQjMA4U8PUfpcaRB2cvxJNoikUK4RQN3sEJt1Fl4Dym3qc2AnODgGK0vKg==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.2.tgz", + "integrity": "sha512-7o7qjwcIB6lqHX0VZA2Vxcp8RHftW1LNcaB6t87PEpco/VPlG0Wn9DnvgmcJ0nZU578/vKQfhDSLTF0EZ+pFAg==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index c816d413798..c9f9e1f16ce 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.6.1", + "webpack-merge": "^5.7.2", "webpack-node-externals": "^2.5.2" }, "browserslist": [ |