Jacob Thornton 35fdbad24b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip ...

Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html

2011-12-22 19:15:09 -08: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

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

2011-12-22 19:15:09 -08:00