Commit 43562af8 authored by Olga Brani's avatar Olga Brani
Browse files

Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4

Conflicts:
	snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
parents c4f6862f 7585f252
......@@ -143,7 +143,7 @@ def send_helpdesk_notification(user, template_name='im/helpdesk_notification.txt
'support': DEFAULT_ADMIN_EMAIL})
sender = DEFAULT_FROM_EMAIL
try:
send_mail('%s alpha2 testing account notification' % SITENAME, message, sender, [DEFAULT_CONTACT_EMAIL])
send_mail('%s alpha2 testing account activated' % SITENAME, message, sender, [DEFAULT_CONTACT_EMAIL])
except (SMTPException, socket.error) as e:
logger.exception(e)
raise SendNotificationError()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment