Merge pull request #15704 from nextcloud/enh/7276/group-names

author blizzz <blizzz@arthur-schiwon.de>

Mon, 27 May 2019 13:09:03 +0000 (15:09 +0200)

committer GitHub <noreply@github.com>

Mon, 27 May 2019 13:09:03 +0000 (15:09 +0200)
author blizzz <blizzz@arthur-schiwon.de>
Mon, 27 May 2019 13:09:03 +0000 (15:09 +0200)
committer GitHub <noreply@github.com>
Mon, 27 May 2019 13:09:03 +0000 (15:09 +0200)
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	blizzz <blizzz@arthur-schiwon.de>
	Mon, 27 May 2019 13:09:03 +0000 (15:09 +0200)
committer	GitHub <noreply@github.com>
	Mon, 27 May 2019 13:09:03 +0000 (15:09 +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