aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/actionmailer.gemspec
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-01-27 17:09:55 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-27 17:09:55 -0800
commit8399a315f5a2dc1dd3d9efd75d66151c793fa664 (patch)
treea22a99d173bf059616ef57ce2062befc811adc6d /actionmailer/actionmailer.gemspec
parent7b8c6472ffb6df4d341b0657f82e63c19e9a429c (diff)
parenta06a5a64ba8f7d7b11025d136013b48a01ccdcc8 (diff)
downloadrails-8399a315f5a2dc1dd3d9efd75d66151c793fa664.tar.gz
rails-8399a315f5a2dc1dd3d9efd75d66151c793fa664.tar.bz2
rails-8399a315f5a2dc1dd3d9efd75d66151c793fa664.zip
Merge remote branch 'mikel/master'
Diffstat (limited to 'actionmailer/actionmailer.gemspec')
-rw-r--r--actionmailer/actionmailer.gemspec3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index d73f86cd65..abbb542293 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
s.homepage = "http://www.rubyonrails.org"
s.add_dependency('actionpack', '= 3.0.pre')
- s.add_dependency('mail', '~> 2.1.1')
+ s.add_dependency('mail', '~> 2.1.2')
+ s.add_dependency('text-format', '~> 1.0.0')
s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
s.has_rdoc = true