Merge pull request #9903 from nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.1.3

Bump webpack-merge from 4.1.2 to 4.1.3 in /settings
This commit is contained in:
Roeland Jago Douma 2018-06-19 11:36:55 +02:00 committed by GitHub
commit 7b8063a242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -6464,9 +6464,9 @@
}
},
"webpack-merge": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz",
"integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz",
"integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
"dev": true,
"requires": {
"lodash": "^4.17.5"

View File

@ -38,6 +38,6 @@
"vue-template-compiler": "^2.5.16",
"webpack": "^4.12.0",
"webpack-cli": "^3.0.3",
"webpack-merge": "^4.1.2"
"webpack-merge": "^4.1.3"
}
}