aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authordependabot[bot] <support@dependabot.com>2019-01-06 13:02:20 +0000
committerdependabot[bot] <support@dependabot.com>2019-01-06 13:02:20 +0000
commit34622fb38a5d4c54b254c1a805f5a77b125d519e (patch)
treeabbd65df8d6f46744af3c086b4cc0c924dc6d41a /apps
parent29dc12c8854215a3fcc5e3230c1b9abeddf32bfa (diff)
downloadnextcloud-server-34622fb38a5d4c54b254c1a805f5a77b125d519e.tar.gz
nextcloud-server-34622fb38a5d4c54b254c1a805f5a77b125d519e.zip
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/accessibility
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 'apps')
-rw-r--r--apps/accessibility/package-lock.json6
-rw-r--r--apps/accessibility/package.json2
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/accessibility/package-lock.json b/apps/accessibility/package-lock.json
index d2e0aedc8dd..1c1066901ef 100644
--- a/apps/accessibility/package-lock.json
+++ b/apps/accessibility/package-lock.json
@@ -6370,9 +6370,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"
diff --git a/apps/accessibility/package.json b/apps/accessibility/package.json
index 0cff7fc9c28..590fe90dfdc 100644
--- a/apps/accessibility/package.json
+++ b/apps/accessibility/package.json
@@ -28,6 +28,6 @@
"vue-template-compiler": "^2.5.21",
"webpack": "^4.28.3",
"webpack-cli": "^3.2.0",
- "webpack-merge": "^4.1.5"
+ "webpack-merge": "^4.2.1"
}
}