jandieman
/
searxng
mirror of https://github.com/searxng/searxng.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
searxng/searx/translations
History
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
..
de/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
en/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
es/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
fr/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
hu/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
it/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
ja/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00
nl/LC_MESSAGES Merge https://github.com/asciimoo/searx into template_oscar 2014-10-26 19:11:28 +01:00