diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:26:44 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:26:44 -0700 |
commit | 4df968071436a4585c8e4694efecfabb02f1a806 (patch) | |
tree | 45ea5201ff32a6063aa24fb90e9ba7f8b8715db0 /railties | |
parent | d66fd081759af32e57baabf7888823cfd9bcebd0 (diff) | |
parent | febd65223e2b3a40755d23a734f6a77e04b97c88 (diff) | |
download | rails-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 'railties')
-rw-r--r-- | railties/CHANGELOG.md | 2 | ||||
-rw-r--r-- | railties/lib/rails/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index d27ea44dd6..c2a4962ded 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.4 (unreleased) ## +## Rails 3.2.4 (May 31, 2012) ## * Add hook for resource route's generator. *Santiago Pastorino* diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 698c8b8e4b..4e0295471c 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 3 MINOR = 2 TINY = 4 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |