Merge pull request #9928 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-merge-4.1.3

Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/oauth2
This commit is contained in:
John Molakvoæ 2018-06-20 11:21:11 +02:00 committed by GitHub
commit 8142ee548c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

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

View File

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