Mark Otto c797cb61a6 conflict

2011-09-10 13:04:17 -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

conflict

2011-09-10 13:04:17 -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