Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto 2012-02-19 14:54:53 -08:00
commit adbbf17ee4
6 changed files with 30 additions and 5 deletions

View file

@ -1581,7 +1581,6 @@ table .span12 {
float: left;
display: none;
min-width: 160px;
_width: 160px;
padding: 4px 0;
margin: 0;
list-style: none;