diff options
| author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2020-09-10 04:02:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 04:02:51 +0300 |
| commit | af4cd26741d871b9f7752add1a9ea898299abd02 (patch) | |
| tree | 8c1cfe3dfc8afe6d213753d507b5b3ce65d5d284 | |
| parent | d2c83005321e80a70867c395f94780422c5c9d29 (diff) | |
| parent | 695ebb659eca5c393eb3a62f6736a344c36d1da7 (diff) | |
Merge pull request #514 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.4v20.0.0beta4
| -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 8320469..a1db055 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11985,9 +11985,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 4270c90..581d21c 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,6 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.44.1", "webpack-cli": "^3.3.12", - "webpack-merge": "^5.1.3" + "webpack-merge": "^5.1.4" } } |