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
..
2014-10-19 12:41:04 +02:00
2014-09-05 10:46:08 +02:00
2014-09-02 17:13:44 +02:00
2014-09-02 17:13:44 +02:00
2014-09-02 17:20:16 +02:00
2014-10-17 12:56:14 +02:00
2014-01-30 01:14:08 +01:00
2014-05-20 16:57:03 +02:00
2014-09-01 15:10:05 +02:00
2014-09-04 23:53:39 +02:00
2014-09-02 20:14:52 +02:00
2014-09-01 17:10:25 +02:00
2014-09-03 13:47:12 +02:00
2014-10-19 12:18:21 +02:00