aboutsummaryrefslogtreecommitdiff
path: root/lib/bootstrap.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-07 13:52:36 -0800
committerMark Otto <[email protected]>2012-01-07 13:52:36 -0800
commit418e2c7d58d9fc6a126a58427b14a2cf68f97423 (patch)
treea9b427a23796162fd8ec3a79e85023931b2970ec /lib/bootstrap.less
parentb81b0e2b15abf4068f55d0055a10c8f5a16aece8 (diff)
parent3eb80591b2c8bb2850caf27da7d6b8c8b747063a (diff)
downloadbootstrap-418e2c7d58d9fc6a126a58427b14a2cf68f97423.tar.xz
bootstrap-418e2c7d58d9fc6a126a58427b14a2cf68f97423.zip
Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip
Conflicts: bootstrap.css
Diffstat (limited to 'lib/bootstrap.less')
-rw-r--r--lib/bootstrap.less1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index df233f128..0335f8651 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -30,6 +30,7 @@
@import "wells.less";
@import "component-animations.less";
@import "close.less";
+@import "progress-bars.less";
// Components: Nav
@import "navbar.less";