aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-13 07:13:41 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-13 07:13:41 +0000
commit45fd631e5e8ff45ed5fcec67905088b30fd2b297 (patch)
tree0a702d919f609cf773b3d3ffa6bd87df9249135c /railties/lib/rails
parent277c1a803ec0882c920e12ffac62bfd2eb7fd6fb (diff)
downloadrails-45fd631e5e8ff45ed5fcec67905088b30fd2b297.tar.gz
rails-45fd631e5e8ff45ed5fcec67905088b30fd2b297.tar.bz2
rails-45fd631e5e8ff45ed5fcec67905088b30fd2b297.zip
Rails::VERSION::STRING on trunk is 1.2.0
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5507 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/version.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index bc87eeac12..c576e885ee 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
module Rails
module VERSION #:nodoc:
MAJOR = 1
- MINOR = 1
- TINY = 2
+ MINOR = 2
+ TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
end