aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/vendor
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-03-16 11:20:28 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-03-16 11:20:28 +0000
commitfc123d189c7394374af91a51efdcc756d3b11185 (patch)
treed0bc7c4760197a4abdea3b3f008a1615436acf54 /actionpack/lib/action_controller/vendor
parent6c688d000f7dc8a4e65d6730c7c425839d2583b4 (diff)
parent4185a4a5f5e53b55c9ba3757a837d33fb91f4091 (diff)
downloadrails-fc123d189c7394374af91a51efdcc756d3b11185.tar.gz
rails-fc123d189c7394374af91a51efdcc756d3b11185.tar.bz2
rails-fc123d189c7394374af91a51efdcc756d3b11185.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/vendor')
-rw-r--r--actionpack/lib/action_controller/vendor/rack-1.0/rack.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb
index 7fab1a7931..6349b95094 100644
--- a/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb
+++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack.rb
@@ -23,7 +23,7 @@ module Rack
# Return the Rack release as a dotted string.
def self.release
- "0.4"
+ "1.0 bundled"
end
autoload :Builder, "rack/builder"