mirror of https://github.com/searxng/searxng
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.pypull/1/head
commit
ada01cb367
Loading…
Reference in New Issue