diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-06-20 11:21:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 11:21:11 +0200 |
| commit | 8142ee548c24daeb383290a81aa883bafcb4df25 (patch) | |
| tree | 9f23b4fca27c2baa5d69229f1c1ac0d7a8ee009e | |
| parent | 1a1c0e7ac0c2fed58efd4ea0f187149380792e70 (diff) | |
| parent | f0316c8b6139b1821f35d8166e702db5cfdbfb64 (diff) | |
| download | nextcloud-server-8142ee548c24daeb383290a81aa883bafcb4df25.tar.gz nextcloud-server-8142ee548c24daeb383290a81aa883bafcb4df25.zip | |
Merge pull request #9928 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-merge-4.1.3
Bump webpack-merge from 4.1.2 to 4.1.3 in /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 b6e7b229aa3..f7e53c59a96 100644 --- a/apps/oauth2/package-lock.json +++ b/apps/oauth2/package-lock.json @@ -5497,9 +5497,9 @@ } }, "webpack-merge": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz", - "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz", + "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==", "dev": true, "requires": { "lodash": "^4.17.5" diff --git a/apps/oauth2/package.json b/apps/oauth2/package.json index 9934b98c45e..b9eba746a00 100644 --- a/apps/oauth2/package.json +++ b/apps/oauth2/package.json @@ -26,6 +26,6 @@ "vue-template-compiler": "^2.5.16", "webpack": "^4.11.1", "webpack-cli": "^3.0.3", - "webpack-merge": "^4.1.2" + "webpack-merge": "^4.1.3" } } |