Merge pull request #764 from ArthurHoaro/feature/history

author ArthurHoaro <arthur@hoa.ro>

Sat, 6 May 2017 15:12:06 +0000 (17:12 +0200)

committer GitHub <noreply@github.com>

Sat, 6 May 2017 15:12:06 +0000 (17:12 +0200)
author ArthurHoaro <arthur@hoa.ro>
Sat, 6 May 2017 15:12:06 +0000 (17:12 +0200)
committer GitHub <noreply@github.com>
Sat, 6 May 2017 15:12:06 +0000 (17:12 +0200)
diff --cc application/LinkDB.php
Simple merge
diff --cc index.php
Simple merge
author	ArthurHoaro <arthur@hoa.ro>
	Sat, 6 May 2017 15:12:06 +0000 (17:12 +0200)
committer	GitHub <noreply@github.com>
	Sat, 6 May 2017 15:12:06 +0000 (17:12 +0200)
		1	2
application/LinkDB.php	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history