Merge branch 'rubenvereecken-master'

This commit is contained in:
Scott Erickson 2014-07-14 10:36:25 -07:00
commit ef30f6f477
2 changed files with 1 additions and 2 deletions

View file

@ -1 +0,0 @@
@import "bootstrap/bootstrap";

View file

@ -64,7 +64,7 @@ exports.config =
'stylesheets/app.css': /^(app|vendor|bower_components)/
order:
before: [
'app/styles/bootstrap.scss'
'app/styles/bootstrap/*'
'vendor/styles/nanoscroller.scss'
]
templates: