Skip to content

Commit 63818c1

Browse files
joshjosh
committed
Merge branch '4-0-stable' into merge-4-0-stable-into-master
Conflicts: lib/sass/rails/importer.rb sass-rails.gemspec sass-rails.gemspec.erb
2 parents 6db9ae6 + 2dc4287 commit 63818c1

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

‎lib/sass/rails/importer.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require 'sass'
12
require 'sprockets/sass_importer'
23

34
module Sass

0 commit comments

Comments
 (0)