diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-06-19 13:05:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 13:05:24 +0200 |
| commit | bb0ff54d82aecef15ff0bca86cacdccb34ad62f9 (patch) | |
| tree | 4fed29f4a573be2c4ac9f9a3388e6a8f37101b5a | |
| parent | b5616578df1d843d141e7b01212ffc1216d41a39 (diff) | |
| parent | 9ebf4eaff6c7477cd778ae148b66097b0b41ad1d (diff) | |
| download | nextcloud-server-bb0ff54d82aecef15ff0bca86cacdccb34ad62f9.tar.gz nextcloud-server-bb0ff54d82aecef15ff0bca86cacdccb34ad62f9.zip | |
Merge pull request #9904 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-merge-4.1.3
Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/updatenotification
| -rw-r--r-- | apps/updatenotification/package-lock.json | 6 | ||||
| -rw-r--r-- | apps/updatenotification/package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/updatenotification/package-lock.json b/apps/updatenotification/package-lock.json index 634102cb9d1..472695c393d 100644 --- a/apps/updatenotification/package-lock.json +++ b/apps/updatenotification/package-lock.json @@ -6988,9 +6988,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/updatenotification/package.json b/apps/updatenotification/package.json index d9b6a664c9c..915397dfd08 100644 --- a/apps/updatenotification/package.json +++ b/apps/updatenotification/package.json @@ -34,6 +34,6 @@ "vue-template-compiler": "^2.5.16", "webpack": "^4.12.0", "webpack-cli": "^3.0.8", - "webpack-merge": "^4.1.2" + "webpack-merge": "^4.1.3" } } |