Mark Otto c5ca743cb7 Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin ...

Conflicts:
	dist/css/bootstrap.min.css

2013-08-14 22:59:02 -07:00

..

css

Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin

2013-08-14 22:59:02 -07:00

js

Drop the accordion for the panel

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