Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-09-12 04:22:39 +0300
committerGitHub <noreply@github.com>2020-09-12 04:22:39 +0300
commit5f46856c6446b5bc9258615dcc84725bf21cb745 (patch)
tree9350c6a35835481f6c299d37277a81cdf82a56a7
parent8ab2d5a8d95288ce6909fc7fb14b419ab15b5a86 (diff)
Bump webpack-merge from 5.1.3 to 5.1.4
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.3 to 5.1.4. - [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/v5.1.3...v5.1.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
-rw-r--r--package-lock.json6
-rw-r--r--package.json2
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json
index 7a20eb65009..ffa8458e2f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9672,9 +9672,9 @@
}
},
"webpack-merge": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz",
- "integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==",
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz",
+ "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index 620fad30f7b..381639ec0bf 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
- "webpack-merge": "^5.1.2",
+ "webpack-merge": "^5.1.4",
"webpack-node-externals": "^2.5.2"
},
"browserslist": [