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

[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

Correct HTML entities and link

2014-12-10 18:15:39 +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