diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-11-15 10:19:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-15 10:19:30 +0000 |
| commit | daa9de87d6a4c0221b8953c4176ddfef81c821dd (patch) | |
| tree | 467d029f73f05b253d466dc5de99662035cef9e5 /package-lock.json | |
| parent | d7ae29646bb89fd13da28196119db5ba6f3ee5bb (diff) | |
| parent | 2364ae35b3fd3cc52231f21226d8bbc40f656d7c (diff) | |
Merge pull request #1124 from nextcloud/dependabot/npm_and_yarn/webpack-merge-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 1467e9f6..bf5ab08b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21039,9 +21039,9 @@ } }, "webpack-merge": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.3.0.tgz", - "integrity": "sha512-4PtsBAWnmJULIJYviiPq4BxwAykbAgGMheyEVaemj2bJI54h+p/gnlbXZEH2EM0IYC3blOE1Qm6kzKlc06N1UQ==", + "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", |