diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-10-02 18:54:28 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 18:54:28 +0900 |
| commit | 96e69b5a33f44e5339345ef3c4871aba51a1e938 (patch) | |
| tree | a0662fdf46c00056fb2ea6ec804611f2587e0be0 /actionmailer/lib | |
| parent | 8171a1b9db029f4c6d45e2df3037d53a4864acb1 (diff) | |
| parent | 3c4b729f48c0320499f16a2e6f50a3d27bde1114 (diff) | |
| download | rails-96e69b5a33f44e5339345ef3c4871aba51a1e938.tar.gz rails-96e69b5a33f44e5339345ef3c4871aba51a1e938.tar.bz2 rails-96e69b5a33f44e5339345ef3c4871aba51a1e938.zip | |
Merge pull request #34049 from sharang-d/marshalling-text-changes
Fix spellings for 'unmarshall(ing/ed)' & 'marshall(ing/ed)'
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/message_delivery.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index 2377aeb9a5..a57980c322 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -29,7 +29,7 @@ module ActionMailer @mail_message ||= processed_mailer.message end - # Unused except for delegator internals (dup, marshaling). + # Unused except for delegator internals (dup, marshalling). def __setobj__(mail_message) #:nodoc: @mail_message = mail_message end |