Merge pull request #4787 from nextcloud/dependabot/npm_and_yarn/webpa…

…ck-merge-5.7.2 Bump webpack-merge from 5.6.1 to 5.7.2
nextcloud · Dec 18, 2020 · a34c39b · a34c39b
2 parents 84c40fe + c939ef5
commit a34c39b
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
@@ -95,7 +95,7 @@
 		"vue-template-compiler": "^2.6.12",
 		"webpack": "^4.44.2",
 		"webpack-cli": "^4.2.0",
-		"webpack-merge": "^5.6.1",
+		"webpack-merge": "^5.7.2",
 		"webpack-node-externals": "^2.5.2"
 	},
 	"browserslist": [