aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/version.rb
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 /railties/lib/rails/version.rb
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 'railties/lib/rails/version.rb')
-rw-r--r--railties/lib/rails/version.rb2
1 files changed, 1 insertions, 1 deletions
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