Merge pull request #23810 from nextcloud/dependabot/npm_and_yarn/file-loader-6.2.0

author John Molakvoæ <skjnldsv@users.noreply.github.com>

Sat, 31 Oct 2020 14:46:36 +0000 (15:46 +0100)

committer GitHub <noreply@github.com>

Sat, 31 Oct 2020 14:46:36 +0000 (15:46 +0100)
author John Molakvoæ <skjnldsv@users.noreply.github.com>
Sat, 31 Oct 2020 14:46:36 +0000 (15:46 +0100)
committer GitHub <noreply@github.com>
Sat, 31 Oct 2020 14:46:36 +0000 (15:46 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	John Molakvoæ <skjnldsv@users.noreply.github.com>
	Sat, 31 Oct 2020 14:46:36 +0000 (15:46 +0100)
committer	GitHub <noreply@github.com>
	Sat, 31 Oct 2020 14:46:36 +0000 (15:46 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history