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

[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 6bbaecbe480f40a8a03473f69d3ba28ae37af1ae..96d37415f33054d54b3615d9c3342106b1a75659 100644 (file)
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@ -29,7 +29,7 @@
 // @import "bootstrap/pagination";
 @import "bootstrap/badge";
 // @import "bootstrap/jumbotron";
-// @import "bootstrap/alert";
+@import "bootstrap/alert";
 // @import "bootstrap/progress";
 // @import "bootstrap/media";
 // @import "bootstrap/list-group";