Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…l-master

Conflicts:
	Gemfile
  • Loading branch information...
commit 81ff7a31808ffc4a54ab551d12e6bdcf6e6e7b54 2 parents 15c87fe + fa5f9a4
Konstantin Haase rkh authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  Gemfile
2  Gemfile
View
@@ -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'
Please sign in to comment.
Something went wrong with that request. Please try again.