Merge pull request #21360 from nextcloud/root-storage-prevent-scanning

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

Thu, 2 Jul 2020 19:07:16 +0000 (21:07 +0200)

committer GitHub <noreply@github.com>

Thu, 2 Jul 2020 19:07:16 +0000 (21:07 +0200)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Thu, 2 Jul 2020 19:07:16 +0000 (21:07 +0200)
committer GitHub <noreply@github.com>
Thu, 2 Jul 2020 19:07:16 +0000 (21:07 +0200)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Thu, 2 Jul 2020 19:07:16 +0000 (21:07 +0200)
committer	GitHub <noreply@github.com>
	Thu, 2 Jul 2020 19:07:16 +0000 (21:07 +0200)
		1	2
lib/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history