Merge pull request #15259 from nextcloud/bugfix/15256-wrong-column-type

author Morris Jobke <hey@morrisjobke.de>

Tue, 7 May 2019 21:52:02 +0000 (23:52 +0200)

committer GitHub <noreply@github.com>

Tue, 7 May 2019 21:52:02 +0000 (23:52 +0200)
author Morris Jobke <hey@morrisjobke.de>
Tue, 7 May 2019 21:52:02 +0000 (23:52 +0200)
committer GitHub <noreply@github.com>
Tue, 7 May 2019 21:52:02 +0000 (23:52 +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>
	Tue, 7 May 2019 21:52:02 +0000 (23:52 +0200)
committer	GitHub <noreply@github.com>
	Tue, 7 May 2019 21:52:02 +0000 (23:52 +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