Mark Otto 9fb380151d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip ... Conflicts: bootstrap.css docs/javascript.html		2011-12-21 18:39:02 -06: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 github.com:twitter/bootstrap into 2.0-wip	2011-12-21 18:39:02 -06:00