Merge pull request #13390 from nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.2.1

Bump webpack-merge from 4.1.5 to 4.2.1 in /settings
This commit is contained in:
Roeland Jago Douma 2019-01-06 16:02:26 +01:00 committed by GitHub
commit 186b0699a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -7892,9 +7892,9 @@
}
},
"webpack-merge": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz",
"integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==",
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
"integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
"dev": true,
"requires": {
"lodash": "^4.17.5"

View file

@ -43,6 +43,6 @@
"vue-template-compiler": "^2.5.21",
"webpack": "^4.28.3",
"webpack-cli": "^3.2.0",
"webpack-merge": "^4.1.5"
"webpack-merge": "^4.2.1"
}
}