diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:29:35 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 15:29:35 -0800 |
| commit | 671538cd6ea0bd4c463e7bf7d238a55924a8af53 (patch) | |
| tree | 661710f2df243f02452846c3e85f2980acbf813a /actionmailer/lib/action_mailer.rb | |
| parent | ca5de16ddc50b4f8d8a88e91571f5c5a2c8c751c (diff) | |
| parent | 3a72923e27195983d37bdb39ef26b29cf03d3483 (diff) | |
| download | rails-671538cd6ea0bd4c463e7bf7d238a55924a8af53.tar.gz rails-671538cd6ea0bd4c463e7bf7d238a55924a8af53.tar.bz2 rails-671538cd6ea0bd4c463e7bf7d238a55924a8af53.zip | |
Merge commit 'mikel/master' into mail
Conflicts:
actionmailer/lib/action_mailer.rb
Diffstat (limited to 'actionmailer/lib/action_mailer.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 8fb6ad2224..0ca08e4d1f 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -40,7 +40,6 @@ module ActionMailer autoload :Quoting, 'action_mailer/quoting' autoload :TestCase, 'action_mailer/test_case' autoload :TestHelper, 'action_mailer/test_helper' - autoload :Utils, 'action_mailer/utils' end |