diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-14 13:13:13 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-14 13:13:13 +0430 |
| commit | bf7429041e64ee0f347764a4579c8c1d14d5b391 (patch) | |
| tree | e52044f40d8ea2310aef97790b5374ac8b8558a4 /actionmailer/lib/rails | |
| parent | 4b05de19aaebcbe20941e8b13aaed2060759ed1c (diff) | |
| parent | c125116013d4b4222f507cfbd1da5ae90bd225d9 (diff) | |
| download | rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.tar.gz rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.tar.bz2 rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionmailer/lib/rails')
| -rw-r--r-- | actionmailer/lib/rails/generators/mailer/templates/mailer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb index 7343eb28b3..21e5918ecb 100644 --- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb +++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb @@ -5,7 +5,7 @@ class <%= class_name %> < ActionMailer::Base # Subject can be set in your I18n file at config/locales/en.yml # with the following lookup: # - # en.actionmailer.<%= file_name %>.<%= action %>.subject + # en.<%= file_name %>.<%= action %>.subject # def <%= action %> @greeting = "Hi" |