aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
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 /actionpack
parent6c656761ec951f74dcb844f46fe6839af3baa1d4 (diff)
downloadrails-f36dcaf488b4357a52f43e3912628428956d351f.tar.gz
rails-f36dcaf488b4357a52f43e3912628428956d351f.tar.bz2
rails-f36dcaf488b4357a52f43e3912628428956d351f.zip
Preparing for 3.2.0 release
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--actionpack/lib/action_pack/version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index ef1d0a9012..8445c3ffaa 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.0 (unreleased) ##
+## Rails 3.2.0 (January 20, 2012) ##
* Setting config.assets.logger to false turn off Sprockets logger *Guillermo Iguaran*
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 5cc7ea0331..3c86150afd 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module ActionPack
MAJOR = 3
MINOR = 2
TINY = 0
- PRE = "rc2"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end