diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-06 13:27:53 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-06 13:27:53 -0700 |
| commit | 817a20b1cd6afb67f8b8774800640f5308bb64de (patch) | |
| tree | 4cf5819def8cd0e376a18b6377441271e522c639 /actionmailer | |
| parent | e9f5b82b991d69b82770151dee3d1ab930a46532 (diff) | |
| parent | 75dc1950e08151fc800ab610f9fd5b6986275a8e (diff) | |
| download | rails-817a20b1cd6afb67f8b8774800640f5308bb64de.tar.gz rails-817a20b1cd6afb67f8b8774800640f5308bb64de.tar.bz2 rails-817a20b1cd6afb67f8b8774800640f5308bb64de.zip | |
Merge pull request #7549 from asanghi/master
Fix Changelog example in Action Mailer [ci skip]
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 45ff9eab1a..ed8ee89617 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -6,7 +6,7 @@ you can now override settings per mail instance for e.g. def my_mailer(user,company) - mail to: customer.email, subject: "Welcome!", + mail to: user.email, subject: "Welcome!", delivery_method_options: {user_name: company.smtp_user, password: company.smtp_password} end |