Jacob Thornton 79d5f90713 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip ...

Conflicts:
	bootstrap-1.3.0.css

2011-09-09 22:48:57 -07:00

..

assets

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

2011-09-09 22:48:57 -07:00

index.html

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

2011-09-09 22:48:57 -07:00

javascript.html

move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like

2011-09-09 22:47:49 -07:00