An error occurred while fetching folder content.
Merge branch 'dojo16'
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
Name Last commit Last update
..