Merge pull request #15514 from nextcloud/feature/noid/add-enterprise-channel

author Morris Jobke <hey@morrisjobke.de>

Thu, 11 Jul 2019 10:42:34 +0000 (12:42 +0200)

committer GitHub <noreply@github.com>

Thu, 11 Jul 2019 10:42:34 +0000 (12:42 +0200)
author Morris Jobke <hey@morrisjobke.de>
Thu, 11 Jul 2019 10:42:34 +0000 (12:42 +0200)
committer GitHub <noreply@github.com>
Thu, 11 Jul 2019 10:42:34 +0000 (12:42 +0200)
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>
	Thu, 11 Jul 2019 10:42:34 +0000 (12:42 +0200)
committer	GitHub <noreply@github.com>
	Thu, 11 Jul 2019 10:42:34 +0000 (12:42 +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