Merge pull request #2217 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.2

Bump webpack-merge from 5.1.1 to 5.1.2

package-lock.json

@@ -22140,9 +22140,9 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz",
-			"integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==",
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.2.tgz",
+			"integrity": "sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g==",
 			"dev": true,
 			"requires": {
 				"clone-deep": "^4.0.1",

package.json

@@ -108,7 +108,7 @@
 		"webpack": "^4.44.1",
 		"webpack-cli": "^3.3.12",
 		"webpack-dev-server": "^3.11.0",
-		"webpack-merge": "^5.1.1"
+		"webpack-merge": "^5.1.2"
 	},
 	"jest": {
 		"moduleFileExtensions": [