aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib
diff options
context:
space:
mode:
authorheavysixer <heavysixer@gmail.com>2008-10-25 13:33:39 -0500
committerheavysixer <heavysixer@gmail.com>2008-10-25 13:33:39 -0500
commit14f05140e53f4f58bc86ee08b9a4ba836c14f9be (patch)
tree03b975c55bb42b964edc8a3507f63f92487a42ed /activeresource/lib
parent35f29f7ea5ba183e49e26367cc31649ff4bd0e97 (diff)
parent650aa015789c704ca8ea864f1117faf3f404a59b (diff)
downloadrails-14f05140e53f4f58bc86ee08b9a4ba836c14f9be.tar.gz
rails-14f05140e53f4f58bc86ee08b9a4ba836c14f9be.tar.bz2
rails-14f05140e53f4f58bc86ee08b9a4ba836c14f9be.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'activeresource/lib')
-rw-r--r--activeresource/lib/active_resource/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 88798ea1c1..d56f4cf17e 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -1,7 +1,7 @@
module ActiveResource
module VERSION #:nodoc:
MAJOR = 2
- MINOR = 1
+ MINOR = 2
TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')