aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-03-30 19:34:33 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2012-03-30 19:34:33 -0300
commit69465d9f7cf1a2b58520a2382694e465cd7762de (patch)
tree343a7c4bb428b79e84cb85625e04696b47cd874a /actionpack/lib
parentdffbb521a0d00c8673a3ad6e0e8ff526f32daf4e (diff)
parent45d6cd94b3ef2ec77166def41f29188445b35608 (diff)
downloadrails-69465d9f7cf1a2b58520a2382694e465cd7762de.tar.gz
rails-69465d9f7cf1a2b58520a2382694e465cd7762de.tar.bz2
rails-69465d9f7cf1a2b58520a2382694e465cd7762de.zip
Merge branch '3-2-3' into 3-2-stable
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_pack/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 00e9277c9d..4d1f19ed13 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 = 3
- PRE = "rc1"
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end