Merge pull request #22151 from nextcloud/dependabot/npm_and_yarn/webp…

…ack-merge-5.1.1 Bump webpack-merge from 5.0.9 to 5.1.1
nextcloud · Aug 11, 2020 · a7875c2 · a7875c2
2 parents f476565 + cd07233
commit a7875c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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": [