Merge pull request #2834 from nextcloud/accesListToShareManager

author Morris Jobke <hey@morrisjobke.de>

Sat, 15 Apr 2017 18:06:24 +0000 (13:06 -0500)

committer GitHub <noreply@github.com>

Sat, 15 Apr 2017 18:06:24 +0000 (13:06 -0500)
author Morris Jobke <hey@morrisjobke.de>
Sat, 15 Apr 2017 18:06:24 +0000 (13:06 -0500)
committer GitHub <noreply@github.com>
Sat, 15 Apr 2017 18:06:24 +0000 (13:06 -0500)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
diff --cc lib/private/Server.php
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Sat, 15 Apr 2017 18:06:24 +0000 (13:06 -0500)
committer	GitHub <noreply@github.com>
	Sat, 15 Apr 2017 18:06:24 +0000 (13:06 -0500)
		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/Server.php	patch \|	diff1 \|	diff2 \|	blob \| history