Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection

author Lukas Reschke <lukas@statuscode.ch>

Mon, 8 May 2017 10:18:40 +0000 (12:18 +0200)

committer GitHub <noreply@github.com>

Mon, 8 May 2017 10:18:40 +0000 (12:18 +0200)
author Lukas Reschke <lukas@statuscode.ch>
Mon, 8 May 2017 10:18:40 +0000 (12:18 +0200)
committer GitHub <noreply@github.com>
Mon, 8 May 2017 10:18:40 +0000 (12:18 +0200)
diff --cc config/config.sample.php
Simple merge
diff --cc lib/composer/composer/autoload_classmap.php
Simple merge
diff --cc lib/composer/composer/autoload_static.php
Simple merge
author	Lukas Reschke <lukas@statuscode.ch>
	Mon, 8 May 2017 10:18:40 +0000 (12:18 +0200)
committer	GitHub <noreply@github.com>
	Mon, 8 May 2017 10:18:40 +0000 (12:18 +0200)
		1	2
config/config.sample.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_classmap.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/composer/composer/autoload_static.php	patch \|	diff1 \|	diff2 \|	blob \| history