diff options
author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2020-09-12 04:09:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-12 04:09:01 +0300 |
commit | 52b7e2ab352fd83ca241b45d82167ea3b06004bf (patch) | |
tree | fd91ca93b949bd990c467d9a60f270d4eeb8fc70 /package-lock.json | |
parent | 1be8b4068e22ec19d8a1f80f921405347aeeedfe (diff) | |
parent | 2aed77fe8f5ae049a959c775d8378e84081918dd (diff) |
Merge pull request #450 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.4
Diffstat (limited to 'package-lock.json')
-rw-r--r-- | package-lock.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package-lock.json b/package-lock.json index 05331e81..f49d62d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12017,9 +12017,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", |