diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-01-06 16:03:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 16:03:07 +0100 |
| commit | f91802ab4feeb1ada370be9365bb5983e9cf42fa (patch) | |
| tree | 25bc13f08984d547dd28639de40fe7fc744496c7 /apps/oauth2 | |
| parent | 49a2dc2b4970e9d56e87a9d3278cb751e127e047 (diff) | |
| parent | 181dc5baa2c9404546d2b8345d29b9167c42ed14 (diff) | |
| download | nextcloud-server-f91802ab4feeb1ada370be9365bb5983e9cf42fa.tar.gz nextcloud-server-f91802ab4feeb1ada370be9365bb5983e9cf42fa.zip | |
Merge pull request #13391 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-merge-4.2.1
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/oauth2
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 f0344cbb8ca..1e071760951 100644 --- a/apps/oauth2/package-lock.json +++ b/apps/oauth2/package-lock.json @@ -4864,9 +4864,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 8dfe0e3a289..1395f26d527 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" } } |