Permalink
Browse files

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

  • Loading branch information...
rkh committed Oct 15, 2011
2 parents e913e53 + 2165ac0 commit 19bb478de130cf2ed78447cc5b61b6ea5b0ee8fe
Showing with 1 addition and 1 deletion.
  1. +1 −1 Gemfile
View
@@ -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

0 comments on commit 19bb478

Please sign in to comment.