diff options
| author | Mark Otto <[email protected]> | 2012-01-26 16:31:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-26 16:31:10 -0800 |
| commit | e7bc2063beb8ab1a36b5001d5847c6995b005a29 (patch) | |
| tree | 541f02a0744d2aad4c985d81a885e9e80270b983 /lib/bootstrap.less | |
| parent | af96da6e895974dd4bd6fb19cf0c6d7e16bf050d (diff) | |
| parent | 7d292f5acc82cfc53a68b1452103c2367c0d8020 (diff) | |
| download | bootstrap-e7bc2063beb8ab1a36b5001d5847c6995b005a29.tar.xz bootstrap-e7bc2063beb8ab1a36b5001d5847c6995b005a29.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'lib/bootstrap.less')
| -rw-r--r-- | lib/bootstrap.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index ede31c035..bc9f84373 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -57,6 +57,7 @@ @import "progress-bars.less"; @import "accordion.less"; @import "carousel.less"; +@import "hero-unit.less"; // Utility classes @import "utilities.less"; // Has to be last to override when necessary |