Merge pull request #31751 from nextcloud/theming-providers

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

Fri, 22 Apr 2022 10:32:14 +0000 (12:32 +0200)

committer GitHub <noreply@github.com>

Fri, 22 Apr 2022 10:32:14 +0000 (12:32 +0200)
author John Molakvoæ <skjnldsv@users.noreply.github.com>
Fri, 22 Apr 2022 10:32:14 +0000 (12:32 +0200)
committer GitHub <noreply@github.com>
Fri, 22 Apr 2022 10:32:14 +0000 (12:32 +0200)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	John Molakvoæ <skjnldsv@users.noreply.github.com>
	Fri, 22 Apr 2022 10:32:14 +0000 (12:32 +0200)
committer	GitHub <noreply@github.com>
	Fri, 22 Apr 2022 10:32:14 +0000 (12:32 +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