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

This commit is contained in:
dependabot-preview[bot] 2020-08-22 01:24:01 +00:00 committed by GitHub
commit e794f98269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View file

@ -12967,9 +12967,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",

View file

@ -83,6 +83,6 @@
"vue-template-compiler": "^2.6.11",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.1.1"
"webpack-merge": "^5.1.2"
}
}