searxng

mirror of https://github.com/searxng/searxng.git synced 2025-10-31 02:27:06 -04:00

History

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