Merge pull request #570 from ArthurHoaro/config-manager

author Arthur <arthur@hoa.ro>

Sat, 9 Jul 2016 05:19:48 +0000 (07:19 +0200)

committer GitHub <noreply@github.com>

Sat, 9 Jul 2016 05:19:48 +0000 (07:19 +0200)
author Arthur <arthur@hoa.ro>
Sat, 9 Jul 2016 05:19:48 +0000 (07:19 +0200)
committer GitHub <noreply@github.com>
Sat, 9 Jul 2016 05:19:48 +0000 (07:19 +0200)
diff --cc tests/FeedBuilderTest.php
Simple merge
diff --cc tests/LinkDBTest.php
Simple merge
diff --cc tpl/tools.html
Simple merge
author	Arthur <arthur@hoa.ro>
	Sat, 9 Jul 2016 05:19:48 +0000 (07:19 +0200)
committer	GitHub <noreply@github.com>
	Sat, 9 Jul 2016 05:19:48 +0000 (07:19 +0200)
		1	2
tests/FeedBuilderTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/LinkDBTest.php	patch \|	diff1 \|	diff2 \|	blob \| history
tpl/tools.html	patch \|	diff1 \|	diff2 \|	blob \| history