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
..
2015-01-09 04:13:05 +01:00
2014-12-29 21:31:04 +01:00
2014-12-16 17:26:16 +01:00
2015-01-05 20:24:33 +01:00
2015-01-03 23:54:02 +01:00
2014-12-16 17:26:16 +01:00
2014-01-30 01:14:08 +01:00
2015-01-11 01:42:55 +01:00
2014-12-29 21:31:04 +01:00
2014-12-16 17:26:16 +01:00
2015-01-11 19:34:11 +01:00
2014-12-16 17:10:20 +01:00
2014-12-16 17:01:25 +01:00
2014-12-11 15:28:04 +01:00
2015-01-02 12:33:40 +01:00
2014-12-29 21:31:04 +01:00
2015-01-11 13:26:42 +01:00
2014-12-16 17:10:20 +01:00
2014-10-19 12:18:21 +02:00
2014-12-16 17:26:16 +01:00