Merge pull request #1273 from ArthurHoaro/feature/ban-manager

author ArthurHoaro <arthur@hoa.ro>

Sat, 25 May 2019 14:13:56 +0000 (16:13 +0200)

committer GitHub <noreply@github.com>

Sat, 25 May 2019 14:13:56 +0000 (16:13 +0200)
author ArthurHoaro <arthur@hoa.ro>
Sat, 25 May 2019 14:13:56 +0000 (16:13 +0200)
committer GitHub <noreply@github.com>
Sat, 25 May 2019 14:13:56 +0000 (16:13 +0200)
diff --cc doc/md/Server-configuration.md
Simple merge
diff --cc index.php
Simple merge
author	ArthurHoaro <arthur@hoa.ro>
	Sat, 25 May 2019 14:13:56 +0000 (16:13 +0200)
committer	GitHub <noreply@github.com>
	Sat, 25 May 2019 14:13:56 +0000 (16:13 +0200)
		1	2
doc/md/Server-configuration.md	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history