diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-09-14 09:51:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-14 09:51:26 +0200 |
| commit | 7d7291edf00d9e4d3e7563341718c9d7eacba1ae (patch) | |
| tree | 010a4b3b0bfe411972446c1b1a66c0003e949a6e | |
| parent | a68e23a53633df83e6dfad9ab775bf777c77f11e (diff) | |
| parent | 5f46856c6446b5bc9258615dcc84725bf21cb745 (diff) | |
| download | nextcloud-server-7d7291edf00d9e4d3e7563341718c9d7eacba1ae.tar.gz nextcloud-server-7d7291edf00d9e4d3e7563341718c9d7eacba1ae.zip | |
Merge pull request #22821 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.4
Bump webpack-merge from 5.1.3 to 5.1.4
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
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": [ |