diff options
| author | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
| commit | 122245fe87bbd293a82ffa6b9c37d8b174b3dc0f (patch) | |
| tree | 35679d94b5787a2ffaf712caa0fab3bf47dd8fa3 /less/bootstrap.less | |
| parent | 0fcaca86b57bf3a4fa2c8f709e90499c92e0db73 (diff) | |
| parent | 55f6beb4278979155549e17da6e87a2548ec0b88 (diff) | |
| download | bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.tar.xz bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.zip | |
Merge branch 'master' into pr/11676
Conflicts:
less/modals.less
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index b368b8710..a46d8d3d4 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -16,7 +16,6 @@ @import "buttons.less"; // Components -@import "component-animations.less"; @import "glyphicons.less"; @import "dropdowns.less"; @import "button-groups.less"; @@ -45,5 +44,6 @@ @import "carousel.less"; // Utility classes +@import "component-animations.less"; @import "utilities.less"; @import "responsive-utilities.less"; |