diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-10-12 10:01:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 10:01:03 +0200 |
| commit | b76698c547bcaf22857f8ec67a8567399520f73a (patch) | |
| tree | 3b6a6eed1d953402178f268eb2e93402e2bd3d94 /package-lock.json | |
| parent | dc400e190efc4a80624065e312cd06e4bd2ca763 (diff) | |
| parent | a754db1b388db4b613935a3253250cf363deab5a (diff) | |
| download | nextcloud-server-b76698c547bcaf22857f8ec67a8567399520f73a.tar.gz nextcloud-server-b76698c547bcaf22857f8ec67a8567399520f73a.zip | |
Merge pull request #23325 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.2.0
Bump webpack-merge from 5.1.4 to 5.2.0
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 09345746863..a8f39b84ddd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9718,9 +9718,9 @@ } }, "webpack-merge": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz", - "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz", + "integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==", "dev": true, "requires": { "clone-deep": "^4.0.1", |