Merge pull request #572 from nextcloud/dependabot/npm_and_yarn/js/webpack-merge-4.1.4

Bump webpack-merge from 4.1.3 to 4.1.4 in /js
2018-08-14 21:29:38 +02:00
parent 9975d2b483 9eab136f53
commit 34767cdd13
2 changed files with 4 additions and 4 deletions
--- a/js/package.json
+++ b/js/package.json
@@ -30,7 +30,7 @@
    "node-sass": "^4.9.3",
    "webpack": "^4.16.5",
    "webpack-cli": "^3.1.0",
-    "webpack-merge": "^4.1.3"
+    "webpack-merge": "^4.1.4"
  },
  "scripts": {
    "build": "./node_modules/webpack-cli/bin/cli.js --mode production --config webpack.prod.config.js",