Mark Otto 48bcf81646 Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip ...

Conflicts:
	dist/css/bootstrap.min.css

2013-08-14 15:19:57 -07:00

..

css

Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip

2013-08-14 15:19:57 -07:00

js

Drop the accordion for the panel

2013-08-12 23:36:25 -07:00