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

..

google-code-prettify

remove unnecessary js lang files from prettify, update styles for prettify

2011-06-30 13:36:47 -07:00

application.js

add temp second topbar to nav section, fix it's compatibility issues

2011-09-02 00:50:05 -07:00