diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-16 11:20:28 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-16 11:20:28 +0000 |
| commit | fc123d189c7394374af91a51efdcc756d3b11185 (patch) | |
| tree | d0bc7c4760197a4abdea3b3f008a1615436acf54 /actionmailer | |
| parent | 6c688d000f7dc8a4e65d6730c7c425839d2583b4 (diff) | |
| parent | 4185a4a5f5e53b55c9ba3757a837d33fb91f4091 (diff) | |
| download | rails-fc123d189c7394374af91a51efdcc756d3b11185.tar.gz rails-fc123d189c7394374af91a51efdcc756d3b11185.tar.bz2 rails-fc123d189c7394374af91a51efdcc756d3b11185.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 5 | ||||
| -rw-r--r-- | actionmailer/Rakefile | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 2a5e3b81d8..773e603d73 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,10 +1,7 @@ -*2.3.1 [RC2] (March 5, 2009)* +*2.3.2 [Final] (March 15, 2009)* * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones] - -*2.3.0 [RC1] (February 1st, 2009)* - * Fixed RFC-2045 quoted-printable bug #1421 [squadette] * Fixed that no body charset would be set when there are attachments present #740 [Paweł Kondzior] diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 7c27ef450f..f06f18ff76 100644 --- 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.3.1' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.3.2' + 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 ac843ae6ac..08ff0d2ffb 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 = 2 MINOR = 3 - TINY = 1 + TINY = 2 STRING = [MAJOR, MINOR, TINY].join('.') end |