Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
This commit is contained in:
Igor Wiedler 2011-10-29 11:41:01 +02:00
commit 7c10058787

View file

@ -2,7 +2,7 @@ Subject: Account activated
Hello {USERNAME},
Your account on "{SITENAME}" has now been activated, you may login using the username you received in a previous e-mail.
Your account on "{SITENAME}" has been activated by an administrator, you may login now.
Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account.