Merge pull request #19196 from nextcloud/feature/17126/allow_apps_to_register_their_o...

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

Sun, 23 Feb 2020 16:00:03 +0000 (17:00 +0100)

committer GitHub <noreply@github.com>

Sun, 23 Feb 2020 16:00:03 +0000 (17:00 +0100)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Sun, 23 Feb 2020 16:00:03 +0000 (17:00 +0100)
committer GitHub <noreply@github.com>
Sun, 23 Feb 2020 16:00:03 +0000 (17:00 +0100)
diff --cc apps/dav/composer/composer/autoload_classmap.php
Simple merge
diff --cc apps/dav/composer/composer/autoload_static.php
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Sun, 23 Feb 2020 16:00:03 +0000 (17:00 +0100)
committer	GitHub <noreply@github.com>
	Sun, 23 Feb 2020 16:00:03 +0000 (17:00 +0100)
		1	2
apps/dav/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
apps/dav/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history