Adam Tauber a04fafd419 Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results ... Conflicts: searx/static/themes/default/css/style.css searx/static/themes/oscar/css/oscar.min.css searx/templates/oscar/result_templates/torrent.html		2015-01-15 18:26:00 +01:00
..
code.html	[enh] add result_templates/code.html	2014-12-20 23:33:03 +01:00
default.html	Few fixes	2015-01-15 01:48:46 +01:00
images.html	Few fixes	2015-01-15 01:48:46 +01:00
map.html	Few fixes	2015-01-15 01:48:46 +01:00
torrent.html	Few fixes	2015-01-15 01:48:46 +01:00
videos.html	Few fixes	2015-01-15 01:48:46 +01:00