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

js/package-lock.json

@@ -7613,9 +7613,9 @@
       }
     },
     "webpack-merge": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz",
-      "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
+      "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.5"

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",