Adam Tauber a04fafd419 Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results ... Conflicts: searx/static/themes/default/css/style.css searx/static/themes/oscar/css/oscar.min.css searx/templates/oscar/result_templates/torrent.html		2015-01-15 18:26:00 +01:00
..
result_templates	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
about.html	[doc] description fixes	2014-12-01 21:33:35 +01:00
base.html	Few fixes	2015-01-15 01:48:46 +01:00
categories.html	Few fixes	2015-01-15 01:48:46 +01:00
github_ribbon.html	add multi theming support	2014-06-05 13:18:22 +02:00
index.html	[mod] default template modifications	2014-10-26 11:14:05 +01:00
infobox.html	Few fixes	2015-01-15 01:48:46 +01:00
opensearch.xml	add multi theming support	2014-06-05 13:18:22 +02:00
opensearch_response_rss.xml	add multi theming support	2014-06-05 13:18:22 +02:00
preferences.html	Few fixes	2015-01-15 01:48:46 +01:00
results.html	Few fixes	2015-01-15 01:48:46 +01:00
search.html	Few fixes	2015-01-15 01:48:46 +01:00
stats.html	add multi theming support	2014-06-05 13:18:22 +02:00