searxng/searx/templates/courgette
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 [new] theme courgette 2014-08-18 10:45:05 +02:00
base.html [enh] make version of searx readable 2014-11-18 11:37:42 +01:00
categories.html [new] theme courgette 2014-08-18 10:45:05 +02:00
github_ribbon.html [new] theme courgette 2014-08-18 10:45:05 +02:00
index.html [new] theme courgette 2014-08-18 10:45:05 +02:00
opensearch.xml [new] theme courgette 2014-08-18 10:45:05 +02:00
opensearch_response_rss.xml [new] theme courgette 2014-08-18 10:45:05 +02:00
preferences.html [new] theme courgette 2014-08-18 10:45:05 +02:00
results.html [enh] better result template handling 2015-01-01 18:59:53 +01:00
search.html [new] theme courgette 2014-08-18 10:45:05 +02:00
stats.html [new] theme courgette 2014-08-18 10:45:05 +02:00