summaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-12-21 08:21:33 +0000
committerGitHub <noreply@github.com>2020-12-21 08:21:33 +0000
commitd0fa143f01ce848de32bdb7d00cf7a6a9e2a6f5d (patch)
treedcadff3d03ca0103ee193359b671d07f9efa7cf1 /package.json
parent4973f9b952a6b2b7150283f3339a16e167807206 (diff)
parent4629b31a0cd2691b1bc346439759c72ff9817fb6 (diff)
downloadnextcloud-server-d0fa143f01ce848de32bdb7d00cf7a6a9e2a6f5d.tar.gz
nextcloud-server-d0fa143f01ce848de32bdb7d00cf7a6a9e2a6f5d.zip
Merge pull request #24773 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.2
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
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": [