Merge pull request #24669 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.6.1

author Roeland Jago Douma <rullzer@users.noreply.github.com>

Tue, 15 Dec 2020 07:36:57 +0000 (08:36 +0100)

committer GitHub <noreply@github.com>

Tue, 15 Dec 2020 07:36:57 +0000 (08:36 +0100)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Tue, 15 Dec 2020 07:36:57 +0000 (08:36 +0100)
committer GitHub <noreply@github.com>
Tue, 15 Dec 2020 07:36:57 +0000 (08:36 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Tue, 15 Dec 2020 07:36:57 +0000 (08:36 +0100)
committer	GitHub <noreply@github.com>
	Tue, 15 Dec 2020 07:36:57 +0000 (08:36 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history