Merge pull request #496 from ArthurHoaro/cross-search

author Arthur <arthur@hoa.ro>

Sun, 28 Feb 2016 13:26:46 +0000 (14:26 +0100)

committer Arthur <arthur@hoa.ro>

Sun, 28 Feb 2016 13:26:46 +0000 (14:26 +0100)
author Arthur <arthur@hoa.ro>
Sun, 28 Feb 2016 13:26:46 +0000 (14:26 +0100)
committer Arthur <arthur@hoa.ro>
Sun, 28 Feb 2016 13:26:46 +0000 (14:26 +0100)
diff --cc inc/shaarli.css
Simple merge
diff --cc index.php
Simple merge
author	Arthur <arthur@hoa.ro>
	Sun, 28 Feb 2016 13:26:46 +0000 (14:26 +0100)
committer	Arthur <arthur@hoa.ro>
	Sun, 28 Feb 2016 13:26:46 +0000 (14:26 +0100)
		1	2
inc/shaarli.css	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history