Merge pull request #882 from ArthurHoaro/feature/edit-timestamp

author ArthurHoaro <arthur@hoa.ro>

Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)

committer GitHub <noreply@github.com>

Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)
author ArthurHoaro <arthur@hoa.ro>
Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)
committer GitHub <noreply@github.com>
Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)
diff --cc index.php
Simple merge
diff --cc tpl/default/css/shaarli.css
Simple merge
author	ArthurHoaro <arthur@hoa.ro>
	Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)
committer	GitHub <noreply@github.com>
	Wed, 31 May 2017 15:54:46 +0000 (17:54 +0200)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
tpl/default/css/shaarli.css	patch \|	diff1 \|	diff2 \|	blob \| history