diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-06 05:26:14 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-06 05:26:14 +0000 |
commit | 944ae628f529a5392a543a88186415e87f462009 (patch) | |
tree | 75da7630316ca0c66c41074f85144cdac6c792d0 /actionmailer | |
parent | 26e381302c7eee09b8d03d32dc7a8233098a9abf (diff) | |
download | rails-944ae628f529a5392a543a88186415e87f462009.tar.gz rails-944ae628f529a5392a543a88186415e87f462009.tar.bz2 rails-944ae628f529a5392a543a88186415e87f462009.zip |
Update versions for Rails 1.1.1
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4183 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r-- | actionmailer/CHANGELOG | 5 | ||||
-rwxr-xr-x | actionmailer/Rakefile | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index c55061b1ce..2ceba66d18 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*1.2.1* (April 6th, 2005) + +* Be part of Rails 1.1.1 + + *1.2.0* (March 27th, 2005) * Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 [ehalvorsen+rails@runbox.com] diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 3da850b966..3cf143b1e1 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.12.0' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.12.1' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 44e37853f1..ba6a301cf9 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 1 MINOR = 2 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end |