aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-01-07 16:59:23 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-07 16:59:23 -0800
commit1ca9c2630167edc8948b865dce8d76ac3e5575c9 (patch)
tree143aedbbe79564c3cb21adc9950a68ef4f24c6a2
parentee85f154534b3e511de810050dd4513402c16a28 (diff)
parent82407f94aad1a8c15a0d19d39d1fed20868c4531 (diff)
downloadrails-1ca9c2630167edc8948b865dce8d76ac3e5575c9.tar.gz
rails-1ca9c2630167edc8948b865dce8d76ac3e5575c9.tar.bz2
rails-1ca9c2630167edc8948b865dce8d76ac3e5575c9.zip
Merge remote branch 'mikel/master'
-rw-r--r--actionmailer/actionmailer.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index 8adea46d35..0c1106b605 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.5.0')
+ s.add_dependency('mail', '~> 1.5.2')
s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
s.has_rdoc = true