diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-06-02 16:24:42 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-06-02 16:24:42 +0100 |
| commit | 52099d889277948130a185a383313ad3f11ceb56 (patch) | |
| tree | 8af57994f45227ebfbe524ad8ebebdb2e931ea22 /app/controllers/user_controller.rb | |
| parent | e340ec13ce7aea11bce69511c603dfb793ee32c7 (diff) | |
| parent | 01421efe2d069a71961e86bf0fcf743eaa5f5c4a (diff) | |
Merge remote-tracking branch 'origin/password-change-subject-typo' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 8d6522923..12207362b 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -288,7 +288,7 @@ class UserController < ApplicationController :reason_params => { :web => "", :email => _("Then you can change your password on {{site_name}}",:site_name=>site_name), - :email_subject => _("Change your password {{site_name}}",:site_name=>site_name) + :email_subject => _("Change your password on {{site_name}}",:site_name=>site_name) }, :circumstance => "change_password" # special login that lets you change your password ) |