aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-01-20 17:44:32 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-01-20 17:44:32 +0100
commitf36dcaf488b4357a52f43e3912628428956d351f (patch)
treea2b50f4cd3acacb85677be52714170a464772991 /actionmailer
parent6c656761ec951f74dcb844f46fe6839af3baa1d4 (diff)
downloadrails-f36dcaf488b4357a52f43e3912628428956d351f.tar.gz
rails-f36dcaf488b4357a52f43e3912628428956d351f.tar.bz2
rails-f36dcaf488b4357a52f43e3912628428956d351f.zip
Preparing for 3.2.0 release
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md2
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index cb6604f31c..ca712d42d8 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 3.2.0 (January 20, 2012) ##
* Upgrade mail version to 2.4.0 *ML*
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 0afdab8672..f72520cb8c 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -3,7 +3,7 @@ module ActionMailer
MAJOR = 3
MINOR = 2
TINY = 0
- PRE = "rc2"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end