searxngRebrandZaclys/searx/templates/courgette
Adam Tauber ada01cb367 Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons
Conflicts:
	searx/templates/courgette/result_templates/default.html
	searx/templates/courgette/result_templates/map.html
	searx/templates/courgette/result_templates/videos.html
	searx/templates/default/result_templates/default.html
	searx/templates/default/result_templates/map.html
	searx/templates/default/result_templates/videos.html
	searx/webapp.py
2014-12-24 20:34:08 +01:00
..
result_templates Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons 2014-12-24 20:34:08 +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_response_rss.xml [new] theme courgette 2014-08-18 10:45:05 +02:00
opensearch.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 HTML Entities + Use the right template 2014-12-10 18:09:21 +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