diff options
| author | Mark Otto <[email protected]> | 2012-01-11 21:59:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-11 21:59:33 -0800 |
| commit | 620d987f9f4a6e5d7bcf270159aea10e01d32a35 (patch) | |
| tree | ba4f28d0061aed2585591ed4455fd58169e2adfc /lib/bootstrap.less | |
| parent | 32c628725924ca014df208fa57de4c5a4050733e (diff) | |
| parent | 19090ea33322e9d4309497f838f8627ca21734bf (diff) | |
| download | bootstrap-620d987f9f4a6e5d7bcf270159aea10e01d32a35.tar.xz bootstrap-620d987f9f4a6e5d7bcf270159aea10e01d32a35.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 57ada98a9..d71002c46 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -39,7 +39,7 @@ // Components: Popovers @import "modals.less"; -@import "twipsy.less"; +@import "tooltip.less"; @import "popovers.less"; // Components: Buttons & Alerts |