Merge branch 'master' of https://github.com/asciimoo/searx into code_results

Browse Source

Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html

...

This commit is contained in:

Thomas Pointhuber

2015-01-09 21:25:13 +01:00

parent af8dac93a8 c8be128e97

commit 400b54191c

252 changed files with 1747 additions and 600 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

2

searx/static/themes/oscar/js/searx.min.js vendored Normal file

File diff suppressed because one or more lines are too long