Merge pull request #28820 from nextcloud/backport/24113/stable20

author Robin Appelman <robin@icewind.nl>

Thu, 16 Sep 2021 14:08:51 +0000 (14:08 +0000)

committer GitHub <noreply@github.com>

Thu, 16 Sep 2021 14:08:51 +0000 (14:08 +0000)
author Robin Appelman <robin@icewind.nl>
Thu, 16 Sep 2021 14:08:51 +0000 (14:08 +0000)
committer GitHub <noreply@github.com>
Thu, 16 Sep 2021 14:08:51 +0000 (14:08 +0000)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	Robin Appelman <robin@icewind.nl>
	Thu, 16 Sep 2021 14:08:51 +0000 (14:08 +0000)
committer	GitHub <noreply@github.com>
	Thu, 16 Sep 2021 14:08:51 +0000 (14:08 +0000)
		1	2
lib/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history