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

Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less

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

..

docs.css

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

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