Mark Otto 542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam ...

Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html

2013-07-17 19:33:30 -07:00

..

bootstrap.css

remove margin from left side of navs since it's no longer being set

2013-07-16 11:49:04 -07:00

docs.css

Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam

2013-07-17 19:33:30 -07:00

pygments-manni.css

…