Thomas Pointhuber 400b54191c Merge branch 'master' of https://github.com/asciimoo/searx into code_results ... Conflicts: searx/engines/searchcode_code.py searx/engines/searchcode_doc.py searx/static/oscar/js/searx.min.js searx/templates/oscar/result_templates/default.html searx/templates/oscar/result_templates/images.html searx/templates/oscar/result_templates/map.html searx/templates/oscar/result_templates/torrent.html searx/templates/oscar/result_templates/videos.html		2015-01-09 21:30:09 +01:00
..
code.html	[enh] add result_templates/code.html	2014-12-20 23:33:03 +01:00
default.html	[fix] static content paths	2015-01-01 19:24:47 +01:00
images.html	Correct alt and title	2014-12-10 18:17:10 +01:00
map.html	[fix] template syntax	2015-01-09 04:05:39 +01:00
torrent.html	[fix] template syntax	2015-01-09 04:05:39 +01:00
videos.html	[fix] favicon paths	2015-01-01 19:52:05 +01:00