aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-05-31 11:26:44 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-05-31 11:26:44 -0700
commit4df968071436a4585c8e4694efecfabb02f1a806 (patch)
tree45ea5201ff32a6063aa24fb90e9ba7f8b8715db0 /activesupport
parentd66fd081759af32e57baabf7888823cfd9bcebd0 (diff)
parentfebd65223e2b3a40755d23a734f6a77e04b97c88 (diff)
downloadrails-4df968071436a4585c8e4694efecfabb02f1a806.tar.gz
rails-4df968071436a4585c8e4694efecfabb02f1a806.tar.bz2
rails-4df968071436a4585c8e4694efecfabb02f1a806.zip
Merge branch '3-2-rel' into 3-2-stable
* 3-2-rel: bumping to 3.2.4 adding security notifications to CHANGELOGs updating changelogs Merge pull request #6558 from parndt/fix_regression
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md2
-rw-r--r--activesupport/lib/active_support/version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index fce7d34918..b231bdd1ac 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.4 (unreleased) ##
+## Rails 3.2.4 (May 31, 2012) ##
* Added #beginning_of_hour and #end_of_hour to Time and DateTime core
extensions. *Mark J. Titorenko*
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index f4cbcb7dff..a5954f07b8 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -3,7 +3,7 @@ module ActiveSupport
MAJOR = 3
MINOR = 2
TINY = 4
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end