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
..
LC_MESSAGES	Merge https://github.com/asciimoo/searx into template_oscar	2014-10-26 19:11:28 +01:00