Merge pull request #546 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.1

This commit is contained in:
dependabot-preview[bot] 2020-08-08 01:28:15 +00:00 committed by GitHub
commit f3f1c259e2
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

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

View file

@ -83,6 +83,6 @@
"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"
}
}