diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-10-10 01:19:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-10 01:19:45 +0000 |
| commit | a754db1b388db4b613935a3253250cf363deab5a (patch) | |
| tree | 9d29348c6a9b5e529ecb9738254b1c168c8c956d | |
| parent | 2ec160aec8ec8d67e8cc42d9f2a83406768b7b6d (diff) | |
| download | nextcloud-server-a754db1b388db4b613935a3253250cf363deab5a.tar.gz nextcloud-server-a754db1b388db4b613935a3253250cf363deab5a.zip | |
Bump webpack-merge from 5.1.4 to 5.2.0
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.4 to 5.2.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.1.4...v5.2.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json index 979a1da18e6..4f5ec735ce1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9672,9 +9672,9 @@ } }, "webpack-merge": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz", - "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz", + "integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index 208e40f98bb..11e78ca590b 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.44.2", "webpack-cli": "^3.3.12", - "webpack-merge": "^5.1.4", + "webpack-merge": "^5.2.0", "webpack-node-externals": "^2.5.2" }, "browserslist": [ |