Merge branch 'renovate/webpack-merge-0.x' into 'develop'

Update dependency webpack-merge to v0.20.0 See merge request pleroma/pleroma-fe!1496
2022-05-22 16:29:39 +00:00 · 2022-05-22 16:29:39 +00:00 · 62fcc16546
commit 62fcc16546
parent dfc166c1ff 8a55f21a98
2 changed files with 11 additions and 5 deletions
--- a/package.json
+++ b/package.json
@ -120,7 +120,7 @@
    "webpack": "4.46.0",
    "webpack-dev-middleware": "3.7.3",
    "webpack-hot-middleware": "2.24.3",
-    "webpack-merge": "0.14.1"
+    "webpack-merge": "0.20.0"
  },
  "engines": {
    "node": ">= 4.0.0",