diff options
| author | dependabot[bot] <support@dependabot.com> | 2019-01-06 13:01:25 +0000 |
|---|---|---|
| committer | dependabot[bot] <support@dependabot.com> | 2019-01-06 13:01:25 +0000 |
| commit | 181dc5baa2c9404546d2b8345d29b9167c42ed14 (patch) | |
| tree | 7588c9e7ee148616ba71cfd0437092a4b1a1786a /apps/oauth2 | |
| parent | 29dc12c8854215a3fcc5e3230c1b9abeddf32bfa (diff) | |
| download | nextcloud-server-181dc5baa2c9404546d2b8345d29b9167c42ed14.tar.gz nextcloud-server-181dc5baa2c9404546d2b8345d29b9167c42ed14.zip | |
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/oauth2
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.1.
- [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/v4.1.5...v4.2.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
Diffstat (limited to 'apps/oauth2')
| -rw-r--r-- | apps/oauth2/package-lock.json | 6 | ||||
| -rw-r--r-- | apps/oauth2/package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/oauth2/package-lock.json b/apps/oauth2/package-lock.json index 03d91c6a723..48e8a3e7cc7 100644 --- a/apps/oauth2/package-lock.json +++ b/apps/oauth2/package-lock.json @@ -4892,9 +4892,9 @@ } }, "webpack-merge": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz", - "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", + "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/apps/oauth2/package.json b/apps/oauth2/package.json index 30c8b777807..f2613813401 100644 --- a/apps/oauth2/package.json +++ b/apps/oauth2/package.json @@ -26,6 +26,6 @@ "vue-template-compiler": "^2.5.21", "webpack": "^4.28.3", "webpack-cli": "^3.2.0", - "webpack-merge": "^4.1.5" + "webpack-merge": "^4.2.1" } } |