Merge pull request #330 from Fudoshiki/patch-1

Available to use last tilt version
rails · May 26, 2015 · 8e68c5f · 8e68c5f
2 parents a264c19 + 0789405
commit 8e68c5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ matrix:
     - rvm: rbx-2
   include:
     - gemfile: Gemfile
-      rvm: 2.2.1
+      rvm: 2.2.2
 
 notifications:
   email: false

diff --git a/sass-rails.gemspec b/sass-rails.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass',            '~> 3.1'
   s.add_dependency 'sprockets-rails', '>= 2.0', '< 4.0'
   s.add_dependency 'sprockets',       '>= 2.8', '< 4.0'
-  s.add_dependency 'tilt',            '~> 1.1'
+  s.add_dependency 'tilt',            '>= 1.1', '< 3'
 
   s.add_development_dependency 'sqlite3'