diff options
| author | Mark Otto <[email protected]> | 2012-02-19 14:54:53 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-19 14:54:53 -0800 |
| commit | adbbf17ee4a241b14503289e6726fc52acefc8a4 (patch) | |
| tree | ac7cc57aca1e989f6b72f0311660b7d2a458884a /docs/assets/css | |
| parent | 16d12396d0f1f352280ae195ac60a15e7e95d666 (diff) | |
| parent | 532242e626c36beb3985e23f3f119373db21262a (diff) | |
| download | bootstrap-adbbf17ee4a241b14503289e6726fc52acefc8a4.tar.xz bootstrap-adbbf17ee4a241b14503289e6726fc52acefc8a4.zip | |
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/assets/css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 535f20a51..fac71d57b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1581,7 +1581,6 @@ table .span12 { float: left; display: none; min-width: 160px; - _width: 160px; padding: 4px 0; margin: 0; list-style: none; |