-
William Grzybowski authored
Conflicts: gui/locale/fr/LC_MESSAGES/django.po gui/locale/pt/LC_MESSAGES/django.po gui/templates/system/email_edit.html
68e23af8
Conflicts: gui/locale/fr/LC_MESSAGES/django.po gui/locale/pt/LC_MESSAGES/django.po gui/templates/system/email_edit.html