Merge branch '1.2.x' of github.com:sinatra/sinatra into 1.2.x

sinatra · Oct 15, 2011 · 19bb478de130cf2ed78447cc5b61b6ea5b0ee8fe · 19bb478
2 parents e913e53 + 2165ac0
commit 19bb478de130cf2ed78447cc5b61b6ea5b0ee8fe
Unified Split

Showing with 1 addition and 1 deletion.

+1 −1 Gemfile
diff --git a/Gemfile b/Gemfile
@@ -40,7 +40,7 @@ if RUBY_VERSION > '1.8.6'
     gem 'nokogiri'
   end
   gem 'coffee-script', '>= 2.0', :group => 'coffee-script'
-  gem 'rdoc', :group => 'rdoc'
+  gem 'rdoc', '< 3.10', :group => 'rdoc'
 end
 
 platforms :ruby do