aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-09-22 21:35:35 +0200
committerMichael Koziarski <michael@koziarski.com>2008-09-22 21:35:35 +0200
commit638bd19c7fdf4a4c09bfa5b4ada23c6f37724f9b (patch)
treec27414d94e86b396fe716e031a6fafb0fc8ca575 /activesupport/lib
parent5795c509a7c0ab9c6d3d707f34526430e58e535c (diff)
parent5f86451a4c5d0beca5a746c4708be48b13f665be (diff)
downloadrails-638bd19c7fdf4a4c09bfa5b4ada23c6f37724f9b.tar.gz
rails-638bd19c7fdf4a4c09bfa5b4ada23c6f37724f9b.tar.bz2
rails-638bd19c7fdf4a4c09bfa5b4ada23c6f37724f9b.zip
Merge branch 'patches' into multibyte
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index b346459a9b..8f5395fca6 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -1,7 +1,7 @@
module ActiveSupport
module VERSION #:nodoc:
MAJOR = 2
- MINOR = 1
+ MINOR = 2
TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')