From: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2020 06:40:48 +0000 (+0000)
Subject: Bump webpack-merge from 5.0.9 to 5.1.1
X-Git-Tag: v20.0.0beta1~91^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cd07233411a387181e3c4a422008ae0759c9739b;p=nextcloud-server.git

Bump webpack-merge from 5.0.9 to 5.1.1

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.0.9 to 5.1.1.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.0.9...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---

diff --git a/package-lock.json b/package-lock.json
index c99ce999f1a..baab710c3a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10234,9 +10234,9 @@
       }
     },
     "webpack-merge": {
-      "version": "5.0.9",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.0.9.tgz",
-      "integrity": "sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz",
+      "integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index 2638336156b..dfc4bd1a4d8 100644
--- 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": [