diff options
| author | dependabot[bot] <support@dependabot.com> | 2018-12-10 02:21:56 +0000 |
|---|---|---|
| committer | dependabot[bot] <support@dependabot.com> | 2018-12-10 02:21:56 +0000 |
| commit | 045ce1fa4974b8b3db5915be1c0816538be411a4 (patch) | |
| tree | a24ce6178f17a819fce973e9b8625723d6e31d1a /settings | |
| parent | 386875cabe0fbc1a44efe7dd64dbc04ad43243d0 (diff) | |
| download | nextcloud-server-045ce1fa4974b8b3db5915be1c0816538be411a4.tar.gz nextcloud-server-045ce1fa4974b8b3db5915be1c0816538be411a4.zip | |
Bump webpack-merge from 4.1.4 to 4.1.5 in /settings
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.4 to 4.1.5.
- [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/commits)
Signed-off-by: dependabot[bot] <support@dependabot.com>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/package-lock.json | 6 | ||||
| -rw-r--r-- | settings/package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/settings/package-lock.json b/settings/package-lock.json index 48ced718dec..7abb8edee5d 100644 --- a/settings/package-lock.json +++ b/settings/package-lock.json @@ -7427,9 +7427,9 @@ } }, "webpack-merge": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz", - "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz", + "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/settings/package.json b/settings/package.json index d2e64070788..df3cd9f207e 100644 --- a/settings/package.json +++ b/settings/package.json @@ -43,6 +43,6 @@ "vue-template-compiler": "^2.5.17", "webpack": "^4.27.1", "webpack-cli": "^3.1.2", - "webpack-merge": "^4.1.4" + "webpack-merge": "^4.1.5" } } |