aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-08-11 14:33:31 +0200
committerGitHub <noreply@github.com>2020-08-11 14:33:31 +0200
commita7875c24315ea4dee0bc164835418091229ae7f0 (patch)
tree1aa68d66652d0b5c753f271e288164926152d1fb /package.json
parentf4765651db412ff262623105c1ebf8c09548bcff (diff)
parentcd07233411a387181e3c4a422008ae0759c9739b (diff)
downloadnextcloud-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
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 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": [