Mark Otto f0d0718322 Merge branch '3.0.0-wip' into bs3_remove_examples ... Conflicts: docs/_includes/nav-getting-started.html docs/examples/navbar-fixed-top.html docs/examples/navbar-static-top.html docs/examples/navbar.html docs/getting-started.html		2013-07-17 20:44:27 -07:00
..
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
ico	rearrange jekyll and docs	2013-02-12 12:44:41 -08:00
js	rebuild doe	2013-07-17 19:33:21 -07:00