aboutsummaryrefslogtreecommitdiffstats
path: root/settings/package-lock.json
diff options
context:
space:
mode:
authordependabot[bot] <support@dependabot.com>2019-01-06 13:01:26 +0000
committerdependabot[bot] <support@dependabot.com>2019-01-06 13:01:26 +0000
commitbe87dccc660cb78936ca85c75c12df513b3ffa8a (patch)
treee3730ef34d0495e57bbcc47cbe0cd72dfcd5399c /settings/package-lock.json
parent29dc12c8854215a3fcc5e3230c1b9abeddf32bfa (diff)
downloadnextcloud-server-be87dccc660cb78936ca85c75c12df513b3ffa8a.tar.gz
nextcloud-server-be87dccc660cb78936ca85c75c12df513b3ffa8a.zip
Bump webpack-merge from 4.1.5 to 4.2.1 in /settings
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.1. - [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.5...v4.2.1) 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 0753dd3ccd6..aa6fddd759f 100644
--- a/settings/package-lock.json
+++ b/settings/package-lock.json
@@ -7891,9 +7891,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"