a01200356 4130b3dfd6 Merge branch 'master' of https://github.com/asciimoo/searx ... Conflicts: searx/tests/test_engines.py		2016-01-10 19:29:05 -06:00
..
test_wolframalpha_api.py	append link to result in wolframalpha_api (and the tests to validate that)	2016-01-05 21:47:31 -06:00
test_wolframalpha_noapi.py	[fix] test in wolframalpha_noapi	2016-01-03 22:03:33 -06:00