Merge pull request #1635 from ArthurHoaro/feature/phpcs

author ArthurHoaro <arthur@hoa.ro>

Tue, 10 Nov 2020 09:46:04 +0000 (10:46 +0100)

committer GitHub <noreply@github.com>

Tue, 10 Nov 2020 09:46:04 +0000 (10:46 +0100)
author ArthurHoaro <arthur@hoa.ro>
Tue, 10 Nov 2020 09:46:04 +0000 (10:46 +0100)
committer GitHub <noreply@github.com>
Tue, 10 Nov 2020 09:46:04 +0000 (10:46 +0100)
diff --cc application/config/ConfigManager.php
Simple merge
diff --cc application/front/controller/admin/ServerController.php
Simple merge
author	ArthurHoaro <arthur@hoa.ro>
	Tue, 10 Nov 2020 09:46:04 +0000 (10:46 +0100)
committer	GitHub <noreply@github.com>
	Tue, 10 Nov 2020 09:46:04 +0000 (10:46 +0100)
		1	2
application/config/ConfigManager.php	patch \|	diff1 \|	diff2 \|	blob \| history
application/front/controller/admin/ServerController.php	patch \|	diff1 \|	diff2 \|	blob \| history