diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-06-19 11:36:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 11:36:55 +0200 |
| commit | 7b8063a2424ea9f9d87493a23074b62afdd57854 (patch) | |
| tree | d78fee41b32c38f3195bc42a688079a54e63ecba | |
| parent | 7ef722e7a626e07f36b2c2c01d650651b1e4e126 (diff) | |
| parent | 9a247a77d47c5ce33d2398e6641c0a85342a5d4d (diff) | |
| download | nextcloud-server-7b8063a2424ea9f9d87493a23074b62afdd57854.tar.gz nextcloud-server-7b8063a2424ea9f9d87493a23074b62afdd57854.zip | |
Merge pull request #9903 from nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.1.3
Bump webpack-merge from 4.1.2 to 4.1.3 in /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 1a734cef5ce..2204cdf78c7 100644 --- a/settings/package-lock.json +++ b/settings/package-lock.json @@ -6464,9 +6464,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/settings/package.json b/settings/package.json index 1d2e55b46be..9412ed00cf1 100644 --- a/settings/package.json +++ b/settings/package.json @@ -38,6 +38,6 @@ "vue-template-compiler": "^2.5.16", "webpack": "^4.12.0", "webpack-cli": "^3.0.3", - "webpack-merge": "^4.1.2" + "webpack-merge": "^4.1.3" } } |