summaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2020-10-12 10:01:03 +0200
committerGitHub <noreply@github.com>2020-10-12 10:01:03 +0200
commitb76698c547bcaf22857f8ec67a8567399520f73a (patch)
tree3b6a6eed1d953402178f268eb2e93402e2bd3d94 /package.json
parentdc400e190efc4a80624065e312cd06e4bd2ca763 (diff)
parenta754db1b388db4b613935a3253250cf363deab5a (diff)
downloadnextcloud-server-b76698c547bcaf22857f8ec67a8567399520f73a.tar.gz
nextcloud-server-b76698c547bcaf22857f8ec67a8567399520f73a.zip
Merge pull request #23325 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.2.0
Bump webpack-merge from 5.1.4 to 5.2.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 ad48397dfee..15d407a20c9 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
- "webpack-merge": "^5.1.4",
+ "webpack-merge": "^5.2.0",
"webpack-node-externals": "^2.5.2"
},
"browserslist": [