diff options
author | Xavier Noria <fxn@hashref.com> | 2011-06-23 18:08:11 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-06-23 18:08:11 +0200 |
commit | 1f505a8ef21a300c22e4c6a3cc4d3bf4cf1853de (patch) | |
tree | e6d3457116b06dac44554b4100ff2ddfd13a64ee /actionmailer/lib/action_mailer/delivery_methods.rb | |
parent | d49622a1f211a036283dcd094c9da0da3bb39fa8 (diff) | |
parent | 06fe01a337ccf7f44bbaf272eddac284f80dcadb (diff) | |
download | rails-1f505a8ef21a300c22e4c6a3cc4d3bf4cf1853de.tar.gz rails-1f505a8ef21a300c22e4c6a3cc4d3bf4cf1853de.tar.bz2 rails-1f505a8ef21a300c22e4c6a3cc4d3bf4cf1853de.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_methods.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/delivery_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb index b324ba790d..d1467fb526 100644 --- a/actionmailer/lib/action_mailer/delivery_methods.rb +++ b/actionmailer/lib/action_mailer/delivery_methods.rb @@ -1,7 +1,7 @@ require 'tmpdir' module ActionMailer - # This modules handles everything related to the delivery, from registering new + # This module handles everything related to mail delivery, from registering new # delivery methods to configuring the mail object to be sent. module DeliveryMethods extend ActiveSupport::Concern |