Merge pull request #34832 from nextcloud/bugfix/noid/allow-to-conditionally-enable...

author Joas Schilling <213943+nickvergessen@users.noreply.github.com>

Fri, 28 Oct 2022 05:30:16 +0000 (07:30 +0200)

committer GitHub <noreply@github.com>

Fri, 28 Oct 2022 05:30:16 +0000 (07:30 +0200)
author Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Fri, 28 Oct 2022 05:30:16 +0000 (07:30 +0200)
committer GitHub <noreply@github.com>
Fri, 28 Oct 2022 05:30:16 +0000 (07:30 +0200)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
diff --cc lib/private/Dashboard/Manager.php
Simple merge
author	Joas Schilling <213943+nickvergessen@users.noreply.github.com>
	Fri, 28 Oct 2022 05:30:16 +0000 (07:30 +0200)
committer	GitHub <noreply@github.com>
	Fri, 28 Oct 2022 05:30:16 +0000 (07:30 +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
lib/private/Dashboard/Manager.php	patch \|	diff1 \|	diff2 \|	blob \| history