Merge branch 'master' of https://github.com/techvision/brails4

tekvision · Apr 4, 2014 · 981b5f3 · 981b5f3
2 parents 40ce82a + b94ddd3
commit 981b5f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/assets/stylesheets/framework_and_overrides.css.scss b/app/assets/stylesheets/framework_and_overrides.css.scss
@@ -1,5 +1,5 @@
 // import the CSS framework
-@import "bootstrap";
+//@import "bootstrap";
 
 // make all images responsive by default
 img {