Thomas Pointhuber 0e1035eac1 Merge https://github.com/asciimoo/searx into template_oscar ... Conflicts: searx/translations/de/LC_MESSAGES/messages.po searx/translations/en/LC_MESSAGES/messages.po searx/translations/es/LC_MESSAGES/messages.po searx/translations/fr/LC_MESSAGES/messages.po searx/translations/hu/LC_MESSAGES/messages.po searx/translations/it/LC_MESSAGES/messages.po searx/translations/nl/LC_MESSAGES/messages.po searx/webapp.py		2014-10-26 19:11:28 +01:00
..
css	[fix] preferences button display	2014-10-05 13:37:26 +02:00
img	oscar template: improve result icons	2014-10-05 14:40:47 +02:00
js	[mod] select autocomplete results with mouse click	2014-07-15 17:02:58 +02:00
less	[fix] preferences button display	2014-10-05 13:37:26 +02:00