Merge branch 'master' of github.com:mbarringer/osem

This commit is contained in:
Matt Barringer 2013-02-11 17:53:41 +01:00
commit bc7f52a3c1

View file

@ -4,7 +4,7 @@ Devise.setup do |config|
# ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
config.mailer_sender = "no-reply@conferences.opensuse.org"
config.mailer_sender = "no-reply@conference.opensuse.org"
# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"