diff options
| author | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 19:02:42 -0700 |
| commit | 9dcae610e97c5422652d7212fda5985de1653d4c (patch) | |
| tree | 03f5f15fb5d3a1561f69ce97a1a9f651e816330c /less/bootstrap.less | |
| parent | 578a14e14aa7c6ad37f307d5d78e9a2afb0e7bfb (diff) | |
| parent | 5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25 (diff) | |
| download | bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.tar.xz bootstrap-9dcae610e97c5422652d7212fda5985de1653d4c.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
examples/justified-nav/justified-nav.css
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index 635e0256c..1344b462f 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -27,6 +27,7 @@ // Components @import "component-animations.less"; +@import "glyphicons.less"; @import "dropdowns.less"; @import "button-groups.less"; @import "input-groups.less"; |