Merge pull request #732 from ArthurHoaro/feature/theme-manager

author Arthur <arthur@hoa.ro>

Fri, 6 Jan 2017 10:40:54 +0000 (11:40 +0100)

committer GitHub <noreply@github.com>

Fri, 6 Jan 2017 10:40:54 +0000 (11:40 +0100)
author Arthur <arthur@hoa.ro>
Fri, 6 Jan 2017 10:40:54 +0000 (11:40 +0100)
committer GitHub <noreply@github.com>
Fri, 6 Jan 2017 10:40:54 +0000 (11:40 +0100)
diff --cc application/config/ConfigPhp.php
Simple merge
diff --cc index.php
Simple merge
author	Arthur <arthur@hoa.ro>
	Fri, 6 Jan 2017 10:40:54 +0000 (11:40 +0100)
committer	GitHub <noreply@github.com>
	Fri, 6 Jan 2017 10:40:54 +0000 (11:40 +0100)
		1	2
application/config/ConfigPhp.php	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history