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
This commit is contained in:
Adam Tauber 2015-01-15 18:26:00 +01:00
commit a04fafd419
26 changed files with 456 additions and 1018 deletions

View file

@ -8,6 +8,8 @@
@import "mixins.less";
@import "code.less";
// Main LESS-Code
html {