diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
| commit | 5395e6175e77d3cd8800bb9f41c09d59934b502f (patch) | |
| tree | 2234488f40eb4f7aa6920fbe2ab41b1d6f53e14e /app/assets/stylesheets/framework/tw_bootstrap.scss | |
| parent | 39d853f5bd9492fa8dfc8e07ec11070705d3c879 (diff) | |
| parent | c0678f2d281242601560e2646cab1aa8a349c4bb (diff) | |
| download | gitlab-ce-issue_3508.tar.gz | |
Merge branch 'master' into issue_3508issue_3508
Diffstat (limited to 'app/assets/stylesheets/framework/tw_bootstrap.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index dd42db1840f..96bab7880c2 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -43,7 +43,6 @@ @import "bootstrap/modals"; @import "bootstrap/tooltip"; @import "bootstrap/popovers"; -@import "bootstrap/carousel"; // Utility classes .clearfix { |