Ponysearch/searx/static
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
..
css Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results 2015-01-15 18:26:00 +01:00
fonts [enh] static content generalization 2015-01-12 14:54:16 +01:00
js [enh] static content generalization 2015-01-12 14:54:16 +01:00
less/bootstrap [enh] static content generalization 2015-01-12 14:54:16 +01:00
themes Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results 2015-01-15 18:26:00 +01:00