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

Browse source

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

parent c5599e3c7c 400b54191c

commit a04fafd419

26 changed files with 456 additions and 1018 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

916

searx/static/css/bootstrap.min.css vendored

View file

File diff suppressed because one or more lines are too long