Jacob Thornton 90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip ...

Conflicts:
	README.md
	bootstrap-1.2.0.css

2011-08-30 23:37:46 -07:00

..

assets

adding dropdowns to tabs by refactoring the shizzzz out of them

2011-08-26 20:38:23 -07:00

index.html

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

2011-08-30 23:37:46 -07:00