diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-06-04 11:05:46 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-06-04 11:05:46 +1200 |
| commit | e3c26e9926948587efcc8d31c729395093407df6 (patch) | |
| tree | 358f418791a56620c32a48776739b4fdf39d3cb0 /actionmailer | |
| parent | b9a9b91a3e3b892ab72ff5c618181747d6b4be04 (diff) | |
| parent | 8afa725f4b98a6e0ceee4792e8ebaebb6189e5f6 (diff) | |
| download | rails-e3c26e9926948587efcc8d31c729395093407df6.tar.gz rails-e3c26e9926948587efcc8d31c729395093407df6.tar.bz2 rails-e3c26e9926948587efcc8d31c729395093407df6.zip | |
Merge branch 'master' into patches
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionmailer/Rakefile | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index b2ce462f0c..bdae0d4d3d 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,4 +1,4 @@ -*2.1.0 RC1 (May 11th, 2008)* +*2.1.0 (May 31st, 2008)* * Fixed that a return-path header would be ignored #7572 [joost] diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 22ed396417..c09526cbef 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 2.0.991' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.1.0' + 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 88b9a3c200..c35b648baf 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,8 +1,8 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 2 - MINOR = 0 - TINY = 991 + MINOR = 1 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end |