diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-08-22 10:02:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 10:02:38 +0300 |
| commit | 65878cd15d558a820c7987907d4f2f969a5f6971 (patch) | |
| tree | 7dc46ca4b520e38f32bdebb98580eb51d2eaa500 /package-lock.json | |
| parent | 59928fd59e498952f265b5731e3e8acce5be8b4f (diff) | |
| parent | 0c5873394b86ee9db9fe88dd637521140db66bb5 (diff) | |
Merge pull request #420 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.2
Bump webpack-merge from 5.1.1 to 5.1.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 c51a0fe9..89b307bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11987,9 +11987,9 @@ } }, "webpack-merge": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz", - "integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.2.tgz", + "integrity": "sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g==", "dev": true, "requires": { "clone-deep": "^4.0.1", |