diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2020-08-10 23:48:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 23:48:50 +0300 |
| commit | 7de5710783e85c6bdd3fcc8f898bf5b9b7c8fb90 (patch) | |
| tree | 64333186b2d21c83f14c21bc23331362004c10e9 /package-lock.json | |
| parent | 974a19c5e10cbd3b96d3ad341bba3af445beb48b (diff) | |
| parent | 9850cb8638a3d56a12d9671546713775fde9a2e0 (diff) | |
Merge pull request #4001 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.1
Bump webpack-merge from 5.0.9 to 5.1.1
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 835b97f80..5f5cd638b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21399,9 +21399,9 @@ } }, "webpack-merge": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.0.9.tgz", - "integrity": "sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz", + "integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==", "dev": true, "requires": { "clone-deep": "^4.0.1", |