summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorDavid Mehren2021-02-12 22:53:05 +0100
committerGitHub2021-02-12 22:53:05 +0100
commitfbac2d7ef8be325635da78e0b762cfb813c1fca2 (patch)
treee8440c525d2caf6f42cf33e3e5581c86526928b9 /package.json
parent6cbf233fe76698462121f2f17c9231421b9673dc (diff)
parent87909b599e08a2361173c3a8717927da51e1aec3 (diff)
Merge pull request #895 from hedgedoc/renovate/master-webpack-merge-5.x
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 4f52135d..532a3346 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
"url-loader": "4.1.1",
"webpack": "4.46.0",
"webpack-cli": "4.5.0",
- "webpack-merge": "4.2.2"
+ "webpack-merge": "5.7.3"
},
"optionalDependencies": {
"bufferutil": "^4.0.0",