Merge pull request #523 from Faldon/master

author Joas Schilling <coding@schilljs.com>

Mon, 25 Jul 2016 09:41:24 +0000 (11:41 +0200)

committer GitHub <noreply@github.com>

Mon, 25 Jul 2016 09:41:24 +0000 (11:41 +0200)
author Joas Schilling <coding@schilljs.com>
Mon, 25 Jul 2016 09:41:24 +0000 (11:41 +0200)
committer GitHub <noreply@github.com>
Mon, 25 Jul 2016 09:41:24 +0000 (11:41 +0200)
diff --cc config/config.sample.php
Simple merge
diff --cc lib/private/Server.php
Simple merge
author	Joas Schilling <coding@schilljs.com>
	Mon, 25 Jul 2016 09:41:24 +0000 (11:41 +0200)
committer	GitHub <noreply@github.com>
	Mon, 25 Jul 2016 09:41:24 +0000 (11:41 +0200)
		1	2
config/config.sample.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/Server.php	patch \|	diff1 \|	diff2 \|	blob \| history