Thomas Pointhuber 400b54191c Merge branch 'master' of https://github.com/asciimoo/searx into code_results ... 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		2015-01-09 21:30:09 +01:00
..
searx_src	Whitespace correction	2015-01-05 02:09:11 +01:00
bootstrap.min.js	[enh] themes static content refactor	2015-01-01 17:48:12 +01:00
html5shiv.min.js	[enh] themes static content refactor	2015-01-01 17:48:12 +01:00
jquery-1.11.1.min.js	[enh] themes static content refactor	2015-01-01 17:48:12 +01:00
leaflet-0.7.3.min.js	[enh] themes static content refactor	2015-01-01 17:48:12 +01:00
require-2.1.15.min.js	[enh] themes static content refactor	2015-01-01 17:48:12 +01:00
respond.min.js	[enh] themes static content refactor	2015-01-01 17:48:12 +01:00
searx.min.js	Merge branch 'master' of https://github.com/asciimoo/searx into code_results	2015-01-09 21:30:09 +01:00
typeahead.bundle.min.js	[enh] themes static content refactor	2015-01-01 17:48:12 +01:00