aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2010-06-01 16:39:05 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2010-06-01 16:39:05 -0500
commitcae25199008bc26d215e7af5558cfcdfdc6ec264 (patch)
tree9b1cd9bf1a2a770af31406652362001460816e5b /actionmailer/lib/action_mailer.rb
parentd57397c4b62b6474ff8eb55bfd763f5e6dcdcd40 (diff)
parenta0bb1dda119a7488b8a4d61b354a64e619b0d1b3 (diff)
downloadrails-cae25199008bc26d215e7af5558cfcdfdc6ec264.tar.gz
rails-cae25199008bc26d215e7af5558cfcdfdc6ec264.tar.bz2
rails-cae25199008bc26d215e7af5558cfcdfdc6ec264.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer/lib/action_mailer.rb')
-rw-r--r--actionmailer/lib/action_mailer.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 70cc312634..6e2d288082 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -49,9 +49,3 @@ module ActionMailer
autoload :TestCase
autoload :TestHelper
end
-
-module Text
- extend ActiveSupport::Autoload
-
- autoload :Format, 'text/format'
-end