Merge pull request #493 from nextcloud/dependabot/npm_and_yarn/js/webpack-merge-4.1.3

Bump webpack-merge from 4.1.2 to 4.1.3 in /js

js/package-lock.json

@@ -9349,9 +9349,9 @@
       }
     },
     "webpack-merge": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz",
-      "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz",
+      "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.5"

js/package.json

@@ -26,7 +26,7 @@
     "node-sass": "^4.5.3",
     "webpack": "^4.12.0",
     "webpack-cli": "^3.0.8",
-    "webpack-merge": "^4.1.2",
+    "webpack-merge": "^4.1.3",
     "karma": "^2.0.3"
   },
   "scripts": {