diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-08-11 14:33:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 14:33:31 +0200 |
| commit | a7875c24315ea4dee0bc164835418091229ae7f0 (patch) | |
| tree | 1aa68d66652d0b5c753f271e288164926152d1fb | |
| parent | f4765651db412ff262623105c1ebf8c09548bcff (diff) | |
| parent | cd07233411a387181e3c4a422008ae0759c9739b (diff) | |
| download | nextcloud-server-a7875c24315ea4dee0bc164835418091229ae7f0.tar.gz nextcloud-server-a7875c24315ea4dee0bc164835418091229ae7f0.zip | |
Merge pull request #22151 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.1
Bump webpack-merge from 5.0.9 to 5.1.1
| -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 4595a3d841b..b2b1dd30b15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10213,9 +10213,9 @@ } }, "webpack-merge": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.0.9.tgz", - "integrity": "sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz", + "integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index 31334ac859c..1bfc6ad8d51 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,7 @@ "vue-template-compiler": "^2.6.11", "webpack": "^4.44.1", "webpack-cli": "^3.3.12", - "webpack-merge": "^5.0.9", + "webpack-merge": "^5.1.1", "webpack-node-externals": "^2.5.1" }, "browserslist": [ |