summaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2020-11-14 10:20:31 +0100
committerGitHub <noreply@github.com>2020-11-14 10:20:31 +0100
commit4d17b6ae375ee785d8210e825cce640b03f80067 (patch)
tree00c6beafc177b62f23f4b5f0e4104e0162caad9a /package.json
parent0d05693f396835fe6cd42c759ad1f1bb31e8744f (diff)
parentc72888c0bb96c50eafcf4b31f88f9329fb07e4f3 (diff)
downloadnextcloud-server-4d17b6ae375ee785d8210e825cce640b03f80067.tar.gz
nextcloud-server-4d17b6ae375ee785d8210e825cce640b03f80067.zip
Merge pull request #24123 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.4.0
Bump webpack-merge from 5.2.0 to 5.4.0
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 92b9a9de7c6..7368d503b9e 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.2.0",
+ "webpack-merge": "^5.4.0",
"webpack-node-externals": "^2.5.2"
},
"browserslist": [