aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/version.rb
diff options
context:
space:
mode:
authorMike Gunderloy <MikeG1@larkfarm.com>2009-03-24 20:06:59 -0500
committerMike Gunderloy <MikeG1@larkfarm.com>2009-03-24 20:06:59 -0500
commitfab9d3b59dc87faec96aa01ce89402a9c3e57df8 (patch)
treefc40fe92aac64a926ba5edd868a031b28f320c61 /railties/lib/rails/version.rb
parent4e27ca4c28432cd735a8ccb82bbaff37941a9d3b (diff)
parent0e6b9695aff6500ad48c4dd9ab61343d7090b030 (diff)
downloadrails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.gz
rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.bz2
rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.zip
Merge branch 'master' of git@github.com:lifo/docrails
Conflicts: railties/guides/source/2_3_release_notes.textile
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 fd38705e75..99c7516a65 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 2
MINOR = 3
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end