diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-11-14 10:20:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-14 10:20:31 +0100 |
| commit | 4d17b6ae375ee785d8210e825cce640b03f80067 (patch) | |
| tree | 00c6beafc177b62f23f4b5f0e4104e0162caad9a /package-lock.json | |
| parent | 0d05693f396835fe6cd42c759ad1f1bb31e8744f (diff) | |
| parent | c72888c0bb96c50eafcf4b31f88f9329fb07e4f3 (diff) | |
| download | nextcloud-server-4d17b6ae375ee785d8210e825cce640b03f80067.tar.gz nextcloud-server-4d17b6ae375ee785d8210e825cce640b03f80067.zip | |
Merge pull request #24123 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.4.0
Bump webpack-merge from 5.2.0 to 5.4.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 e2c7c438f9b..55e31b5c0ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11240,9 +11240,9 @@ } }, "webpack-merge": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz", - "integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz", + "integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==", "dev": true, "requires": { "clone-deep": "^4.0.1", |