diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-08-24 09:12:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 09:12:45 +0200 |
| commit | 7fb1e44b53d5fdd718fb59600c497eddae1bcc6a (patch) | |
| tree | ff55ed17e96c05fa5ff7b0050b4a32706b715fca | |
| parent | 7b7cbe6f3663692e631a33750c09ab699e1d7023 (diff) | |
| parent | e1742c670155576c078557bc63c0ea6568c0e0bc (diff) | |
| download | nextcloud-server-7fb1e44b53d5fdd718fb59600c497eddae1bcc6a.tar.gz nextcloud-server-7fb1e44b53d5fdd718fb59600c497eddae1bcc6a.zip | |
Merge pull request #22365 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.2
Bump webpack-merge from 5.1.1 to 5.1.2
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json index 2385a8ad005..8cf1521e368 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10233,9 +10233,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", diff --git a/package.json b/package.json index 7b33ece1adb..8105161cdbe 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "vue-template-compiler": "^2.6.11", "webpack": "^4.44.1", "webpack-cli": "^3.3.12", - "webpack-merge": "^5.1.1", + "webpack-merge": "^5.1.2", "webpack-node-externals": "^2.5.1" }, "browserslist": [ |