diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-12-18 09:06:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 09:06:46 +0100 |
| commit | a34c39bfa34769992e22ecddd991a38a90536711 (patch) | |
| tree | 5144ae7f2f31f0c67c74ac34b79c4b5fd88f6613 /package-lock.json | |
| parent | 84c40fe19b4e99be4fab0743452826b03db7e1cb (diff) | |
| parent | c939ef57fb86680f638f0797082d30decd72d899 (diff) | |
Merge pull request #4787 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.2
Bump webpack-merge from 5.6.1 to 5.7.2
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 c5e228c78..e02c89845 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21897,9 +21897,9 @@ } }, "webpack-merge": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.6.1.tgz", - "integrity": "sha512-5n19s1YcyQkBJkYtE+Tq3br/Ax6ofQjMA4U8PUfpcaRB2cvxJNoikUK4RQN3sEJt1Fl4Dym3qc2AnODgGK0vKg==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.2.tgz", + "integrity": "sha512-7o7qjwcIB6lqHX0VZA2Vxcp8RHftW1LNcaB6t87PEpco/VPlG0Wn9DnvgmcJ0nZU578/vKQfhDSLTF0EZ+pFAg==", "dev": true, "requires": { "clone-deep": "^4.0.1", |