Files
modoboa/doc
Antoine Nguyen 84837d3813 Merge branch '1.1.x'
Conflicts:
	modoboa/locale/cs_CZ/LC_MESSAGES/django.po
	modoboa/locale/de/LC_MESSAGES/django.po
	modoboa/locale/en/LC_MESSAGES/django.po
	modoboa/locale/es/LC_MESSAGES/django.po
	modoboa/locale/fr/LC_MESSAGES/django.po
	modoboa/locale/it/LC_MESSAGES/django.po
	modoboa/locale/nl_NL/LC_MESSAGES/django.po
	modoboa/locale/pt_PT/LC_MESSAGES/django.po
	modoboa/locale/ru/LC_MESSAGES/django.po
	modoboa/locale/sv/LC_MESSAGES/django.po
2014-08-24 14:51:30 +02:00
..
2014-08-24 14:51:30 +02:00
2014-08-24 14:51:30 +02:00
2014-08-23 19:03:49 +02:00
2014-07-20 17:28:22 +02:00
2014-08-23 19:03:49 +02:00