Merge pull request #23655 from nextcloud/dependabot/npm_and_yarn/exports-loader-1.1.1

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

Mon, 26 Oct 2020 12:03:58 +0000 (13:03 +0100)

committer GitHub <noreply@github.com>

Mon, 26 Oct 2020 12:03:58 +0000 (13:03 +0100)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Mon, 26 Oct 2020 12:03:58 +0000 (13:03 +0100)
committer GitHub <noreply@github.com>
Mon, 26 Oct 2020 12:03:58 +0000 (13:03 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Mon, 26 Oct 2020 12:03:58 +0000 (13:03 +0100)
committer	GitHub <noreply@github.com>
	Mon, 26 Oct 2020 12:03:58 +0000 (13:03 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history