diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-03-04 09:36:03 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-03-04 09:36:03 +0100 |
| commit | 86071a4049f83d50e5d8300e0bb40808188e7936 (patch) | |
| tree | 51a328ed3f87d66c8b4338b99b3939340731758f /actionmailer | |
| parent | 852e0ad200bde1d86f30ca68b2e70c9d4062148b (diff) | |
| parent | b6c9d4d76fe027bd58c6a857f8d5150839fe7a08 (diff) | |
| download | rails-86071a4049f83d50e5d8300e0bb40808188e7936.tar.gz rails-86071a4049f83d50e5d8300e0bb40808188e7936.tar.bz2 rails-86071a4049f83d50e5d8300e0bb40808188e7936.zip | |
Merge pull request #24045 from Sarah-Alsinan/patch-4
Update base.rb [ci skip]
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 559cd06d91..a223cf82a1 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -289,7 +289,7 @@ module ActionMailer # # Note that the proc is evaluated right at the start of the mail message generation, so if you # set something in the default using a proc, and then set the same thing inside of your - # mailer method, it will get over written by the mailer method. + # mailer method, it will get overwritten by the mailer method. # # It is also possible to set these default options that will be used in all mailers through # the <tt>default_options=</tt> configuration in <tt>config/application.rb</tt>: |