aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-28 11:06:46 -0700
committerwycats <wycats@gmail.com>2010-03-28 11:06:46 -0700
commitc99194c7bed6744104e114ab231ef39158044a63 (patch)
tree9566ad06335bf96d4c32e421c2d25b4676b3e0d3 /actionmailer/lib/action_mailer/base.rb
parent835f5d0269a8d3615585119e77f1ba7d601c943b (diff)
parentf1e5a9ff982998c31c9dedf2fa79180c7dea820a (diff)
downloadrails-c99194c7bed6744104e114ab231ef39158044a63.tar.gz
rails-c99194c7bed6744104e114ab231ef39158044a63.tar.bz2
rails-c99194c7bed6744104e114ab231ef39158044a63.zip
Merge remote branch 'rizwan/restrict'
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r--actionmailer/lib/action_mailer/base.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 0519783d02..793cd53518 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -2,6 +2,7 @@ require 'mail'
require 'action_mailer/tmail_compat'
require 'action_mailer/collector'
require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/blank'
module ActionMailer #:nodoc:
# Action Mailer allows you to send email from your application using a mailer model and views.