diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-11-14 02:20:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 02:20:47 +0000 |
| commit | c72888c0bb96c50eafcf4b31f88f9329fb07e4f3 (patch) | |
| tree | e3e24116aed0a733157dcc53b416380bb9018355 | |
| parent | cd270d49c0782a7fbe2d63cb574654d1c1511461 (diff) | |
| download | nextcloud-server-c72888c0bb96c50eafcf4b31f88f9329fb07e4f3.tar.gz nextcloud-server-c72888c0bb96c50eafcf4b31f88f9329fb07e4f3.zip | |
Bump webpack-merge from 5.2.0 to 5.4.0
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.2.0 to 5.4.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.2.0...v5.4.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 2a14ac4541d..665db4a4002 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11240,9 +11240,9 @@ } }, "webpack-merge": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz", - "integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz", + "integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index dedfcc02d47..106a51404e2 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.44.2", "webpack-cli": "^4.2.0", - "webpack-merge": "^5.2.0", + "webpack-merge": "^5.4.0", "webpack-node-externals": "^2.5.2" }, "browserslist": [ |