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
..
courgette	Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons	2014-12-24 20:34:08 +01:00
default	Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons	2014-12-24 20:34:08 +01:00
oscar	Final commit on favicons	2014-12-18 16:26:32 +01:00