aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/actionmailer.gemspec
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-04-11 19:20:39 -0700
committerwycats <wycats@gmail.com>2010-04-11 19:20:39 -0700
commit59c6082d9867572352e2ac2070d5aa9590132ef8 (patch)
treee9211dd3d0699452e623309a612a3be5efba0f0e /actionmailer/actionmailer.gemspec
parentecf039fc05ac32b7a8cbd005dd4723d7eadc61c0 (diff)
parentdd02090d762bfbb8fdada60142e35247797f32c7 (diff)
downloadrails-59c6082d9867572352e2ac2070d5aa9590132ef8.tar.gz
rails-59c6082d9867572352e2ac2070d5aa9590132ef8.tar.bz2
rails-59c6082d9867572352e2ac2070d5aa9590132ef8.zip
Merge remote branch 'mikel/master'
Diffstat (limited to 'actionmailer/actionmailer.gemspec')
-rw-r--r--actionmailer/actionmailer.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index 410df0e106..01a886c5ee 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
s.has_rdoc = true
s.add_dependency('actionpack', version)
- s.add_dependency('mail', '~> 2.1.5.3')
+ s.add_dependency('mail', '~> 2.2.0')
s.add_dependency('text-format', '~> 1.0.0')
end