aboutsummaryrefslogtreecommitdiff
path: root/less/bootstrap.less
diff options
context:
space:
mode:
authorIvan Khalopik <[email protected]>2013-05-07 15:16:45 +0300
committerIvan Khalopik <[email protected]>2013-05-07 15:16:45 +0300
commit3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch)
treef11fa18c33d1a65ae4422dc3c352c34a2b323b8c /less/bootstrap.less
parent41c782567775d3bbcfc62d163ae22a531277b5e2 (diff)
parentb352f98f325adbd994f01cb94f4d0a454783bbce (diff)
downloadbootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz
bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts: js/tests/unit/bootstrap-collapse.js
Diffstat (limited to 'less/bootstrap.less')
-rw-r--r--less/bootstrap.less2
1 files changed, 2 insertions, 0 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less
index 461f9ecea..c73c85c38 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -30,6 +30,8 @@
@import "component-animations.less";
@import "glyphicons.less";
@import "dropdowns.less";
+@import "list-group.less";
+@import "panels.less";
@import "wells.less";
@import "close.less";