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
..
assets	window -> body for ie	2011-08-28 17:52:55 -07:00
hero.html	rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html	2011-08-30 23:34:19 -07:00
javascript.html	add google code prettify	2011-08-28 13:30:04 -07:00