aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-07-02 10:25:18 +0200
committerJosé Valim <jose.valim@gmail.com>2009-07-02 10:25:18 +0200
commit1c265da1db934ffab0a5151dc7beeed3ef1bbabb (patch)
treee3e2af724e0fe70b9bceb09a26a179fadf76b992 /activeresource/lib
parent4739f0ff5d5c013eb33aed7f371a3a91d3fca292 (diff)
parent8bb510f6c1e235f5fb1cf9e79af759a429a497b0 (diff)
downloadrails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.gz
rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.tar.bz2
rails-1c265da1db934ffab0a5151dc7beeed3ef1bbabb.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activeresource/lib')
-rw-r--r--activeresource/lib/active_resource/version.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 3df2555d53..0f312eac39 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -1,8 +1,8 @@
module ActiveResource
module VERSION #:nodoc:
- MAJOR = 2
- MINOR = 3
- TINY = 2
+ MAJOR = 3
+ MINOR = 0
+ TINY = "pre"
STRING = [MAJOR, MINOR, TINY].join('.')
end