Merge pull request #23819 from nextcloud/td/routing/move_things_around

author Morris Jobke <hey@morrisjobke.de>

Wed, 4 Nov 2020 21:16:13 +0000 (22:16 +0100)

committer GitHub <noreply@github.com>

Wed, 4 Nov 2020 21:16:13 +0000 (22:16 +0100)
author Morris Jobke <hey@morrisjobke.de>
Wed, 4 Nov 2020 21:16:13 +0000 (22:16 +0100)
committer GitHub <noreply@github.com>
Wed, 4 Nov 2020 21:16:13 +0000 (22:16 +0100)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Wed, 4 Nov 2020 21:16:13 +0000 (22:16 +0100)
committer	GitHub <noreply@github.com>
	Wed, 4 Nov 2020 21:16:13 +0000 (22:16 +0100)
		1	2
lib/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history