diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-29 14:55:33 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-29 14:56:00 +0100 |
commit | e57fa3d276d700ea21c97f8c2d3731f0f9d4c7ab (patch) | |
tree | 1c9e555bde2d3b1a2007841f02ae62b3c3520b37 /app/models/application_mailer.rb | |
parent | 3084034493a428b2394a59b68921ed4b73a8cf7e (diff) | |
parent | b4aefe5a69bbd492959931f1c577a028ec361993 (diff) |
Attempt to merge current develop to theme
Diffstat (limited to 'app/models/application_mailer.rb')
-rw-r--r-- | app/models/application_mailer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/application_mailer.rb b/app/models/application_mailer.rb index 9628d7339..e9f82a2c3 100644 --- a/app/models/application_mailer.rb +++ b/app/models/application_mailer.rb @@ -15,8 +15,8 @@ class ApplicationMailer < ActionMailer::Base self.raise_delivery_errors = true def contact_from_name_and_email - contact_name = MySociety::Config.get("CONTACT_NAME", 'contact@localhost') - contact_email = MySociety::Config.get("CONTACT_EMAIL", 'Alaveteli') + contact_name = MySociety::Config.get("CONTACT_NAME", 'Alaveteli') + contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') return "#{contact_name} <#{contact_email}>" end |