Merge remote-tracking branch 'upstream/pull/2498'

[rails.git] / app / assets / stylesheets / _bootstrap-custom.scss

diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss
index c07fc2d07e47080dc140aac6ed4d3cffc1afd339..e502f7db6fdcd1e9d0c832c5385df6222997901e 100644 (file)
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@ -13,7 +13,7 @@
 @import "bootstrap/type";
 // @import "bootstrap/images";
 // @import "bootstrap/code";
-// @import "bootstrap/grid";
+@import "bootstrap/grid";
 // @import "bootstrap/tables";
 // @import "bootstrap/forms";
 // @import "bootstrap/buttons";