Jacob Thornton e11c49cc48 Merge branch 'master' of github.com:twitter/bootstrap ...

Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html

2011-08-21 21:42:56 -07:00

..

css

Merge branch 'master' of github.com:twitter/bootstrap

2011-08-21 21:42:56 -07:00

img

adding more details on browser support, adding snippet of about text, changed p tags to have half the bottom margin

2011-08-20 01:51:06 -07:00

js

merge in master, resolve conflicts

2011-08-21 20:47:24 -07:00