Merge pull request #819 from ArthurHoaro/feature/multi-delete

author ArthurHoaro <arthur@hoa.ro>

Thu, 25 May 2017 13:03:32 +0000 (15:03 +0200)

committer GitHub <noreply@github.com>

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