diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-12-15 08:36:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 08:36:57 +0100 |
| commit | 050fa4a746c23cc7e324c8e6dd2ae6df35f05c6f (patch) | |
| tree | 5e0b59a15069dd0418541bfef879956c97f16413 | |
| parent | 8d3fcdb5b48eb5b0d1c2aab161f755d4f7e822e9 (diff) | |
| parent | a9b0a4e307a1f0868937922a870fffc2ca5a4356 (diff) | |
| download | nextcloud-server-050fa4a746c23cc7e324c8e6dd2ae6df35f05c6f.tar.gz nextcloud-server-050fa4a746c23cc7e324c8e6dd2ae6df35f05c6f.zip | |
Merge pull request #24669 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.6.1
Bump webpack-merge from 5.4.0 to 5.6.1
| -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 d7f5f230c23..2bac8eb21be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10977,9 +10977,9 @@ } }, "webpack-merge": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz", - "integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.6.1.tgz", + "integrity": "sha512-5n19s1YcyQkBJkYtE+Tq3br/Ax6ofQjMA4U8PUfpcaRB2cvxJNoikUK4RQN3sEJt1Fl4Dym3qc2AnODgGK0vKg==", "dev": true, "requires": { "clone-deep": "^4.0.1", diff --git a/package.json b/package.json index b65260ffee7..21de2cd782b 100644 --- a/package.json +++ b/package.json @@ -127,7 +127,7 @@ "vue-template-compiler": "^2.6.12", "webpack": "^4.44.2", "webpack-cli": "^4.2.0", - "webpack-merge": "^5.4.0", + "webpack-merge": "^5.6.1", "webpack-node-externals": "^2.5.2" }, "browserslist": [ |