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

..

courgette

Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results

2015-01-15 18:26:00 +01:00

default

Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results

2015-01-15 18:26:00 +01:00

oscar

Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results

2015-01-15 18:26:00 +01:00