Merge pull request #572 from nextcloud/dependabot/npm_and_yarn/js/webpack-merge-4.1.4

Bump webpack-merge from 4.1.3 to 4.1.4 in /js
This commit is contained in:
Julius Härtl
2018-08-14 21:29:38 +02:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

6
js/package-lock.json generated
View File

@@ -7613,9 +7613,9 @@
}
},
"webpack-merge": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz",
"integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
"version": "4.1.4",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
"integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
"dev": true,
"requires": {
"lodash": "^4.17.5"