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	Merge branch 'master' of https://github.com/asciimoo/searx into code_results	2015-01-09 21:30:09 +01:00
default.html	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
images.html	Merge branch 'master' of https://github.com/asciimoo/searx into code_results	2015-01-09 21:30:09 +01:00
map.html	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
torrent.html	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00
videos.html	Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results	2015-01-15 18:26:00 +01:00