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
..
messages	oscar template: add no result message	2014-10-05 14:40:47 +02: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	little enhancement of oscar template	2014-10-05 14:40:46 +02:00
base.html	[enh] show text "Start search" instead of icon, if javascript is disabled	2015-01-15 16:03:30 +01:00
categories.html
index.html
infobox.html
macros.html
navbar.html
opensearch.xml
opensearch_response_rss.xml
preferences.html
results.html
search.html
search_full.html	[enh] show text "Start search" instead of icon, if javascript is disabled	2015-01-15 16:03:30 +01:00
stats.html