Mark Otto 6d118411e1 resolve conflict

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

..

assets

Merge branch 'master' of github.com:twitter/bootstrap into js-examples

2011-09-02 21:04:25 -07:00

index.html

tweak readonly, disabled, and uneditable form elements

2011-09-02 21:54:11 -07:00