aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/actionmailer.gemspec
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-23 15:29:35 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-23 15:29:35 -0800
commit671538cd6ea0bd4c463e7bf7d238a55924a8af53 (patch)
tree661710f2df243f02452846c3e85f2980acbf813a /actionmailer/actionmailer.gemspec
parentca5de16ddc50b4f8d8a88e91571f5c5a2c8c751c (diff)
parent3a72923e27195983d37bdb39ef26b29cf03d3483 (diff)
downloadrails-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/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 6de4986430..d5a684aa7b 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.homepage = "http://www.rubyonrails.org"
s.add_dependency('actionpack', '= 3.0.pre')
- s.add_dependency('mail', '~> 1.2.8')
+ s.add_dependency('mail', '~> 1.3.0')
s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
s.has_rdoc = true