Merge pull request #598 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.4

This commit is contained in:
dependabot[bot] 2020-09-12 01:06:33 +00:00 committed by GitHub
commit 726fdba376
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

@ -12999,9 +12999,9 @@
}
},
"webpack-merge": {
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz",
"integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==",
"version": "5.1.4",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz",
"integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",

View file

@ -83,6 +83,6 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.1.3"
"webpack-merge": "^5.1.4"
}
}