Thomas Pointhuber 400b54191c Merge branch 'master' of https://github.com/asciimoo/searx into code_results ... Conflicts: searx/engines/searchcode_code.py searx/engines/searchcode_doc.py searx/static/oscar/js/searx.min.js searx/templates/oscar/result_templates/default.html searx/templates/oscar/result_templates/images.html searx/templates/oscar/result_templates/map.html searx/templates/oscar/result_templates/torrent.html searx/templates/oscar/result_templates/videos.html		2015-01-09 21:30:09 +01:00
..
result_templates	Merge branch 'master' of https://github.com/asciimoo/searx into code_results	2015-01-09 21:30:09 +01:00
about.html	[doc] description fixes	2014-12-01 21:33:35 +01:00
base.html	[enh] make version of searx readable	2014-11-18 11:37:42 +01:00
categories.html	[enh] category select warning message	2014-11-18 19:44:33 +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	[fix] mysterious string remove	2014-12-14 02:27:58 +01:00
opensearch_response_rss.xml	add multi theming support	2014-06-05 13:18:22 +02:00
opensearch.xml	add multi theming support	2014-06-05 13:18:22 +02:00
preferences.html	add multi theming support	2014-06-05 13:18:22 +02:00
results.html	[enh] better result template handling	2015-01-01 18:59:53 +01:00
search.html	[mod] default template modifications	2014-10-26 11:14:05 +01:00
stats.html	add multi theming support	2014-06-05 13:18:22 +02:00