kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

Merge branch 'master' of https://github.com/timfel/sinatra into timfel-master

Browse source 
Conflicts:
	Gemfile
This commit is contained in:
Konstantin Haase 2011-06-15 11:56:47 +02:00
commit 81ff7a3180
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -29,7 +29,7 @@ gem 'sass', :group => 'sass'
gem 'builder', :group => 'builder'
gem 'erubis', :group => 'erubis'
gem 'less', '~> 1.0', :group => 'less'
gem 'liquid', :group => 'liquid'
gem 'liquid', :group => 'liquid' unless RUBY_ENGINE == 'maglev'
gem 'slim', :group => 'slim'
gem 'RedCloth', :group => 'redcloth' if RUBY_VERSION < "1.9.3" and not RUBY_ENGINE.start_with? 'ma'
gem 'coffee-script', '>= 2.0', :group => 'coffee-script'