summaryrefslogtreecommitdiffstats
path: root/settings/package-lock.json
diff options
context:
space:
mode:
authordependabot[bot] <support@dependabot.com>2018-06-19 07:54:40 +0000
committerdependabot[bot] <support@dependabot.com>2018-06-19 07:54:40 +0000
commit9a247a77d47c5ce33d2398e6641c0a85342a5d4d (patch)
tree6e53105b79c43acbc15822f3fe811e2f6829a5d3 /settings/package-lock.json
parentb8492c694480e210aaf2c794ed18adf5a9a751b2 (diff)
downloadnextcloud-server-9a247a77d47c5ce33d2398e6641c0a85342a5d4d.tar.gz
nextcloud-server-9a247a77d47c5ce33d2398e6641c0a85342a5d4d.zip
Bump webpack-merge from 4.1.2 to 4.1.3 in /settings
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.2 to 4.1.3. - [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.2...v4.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
Diffstat (limited to 'settings/package-lock.json')
-rw-r--r--settings/package-lock.json6
1 files changed, 3 insertions, 3 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"