2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00

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
This commit is contained in:
Mark Otto
2013-07-17 20:44:27 -07:00
70 changed files with 1507 additions and 10005 deletions
+6
View File
@@ -11,6 +11,12 @@
<li>
<a href="#template">Basic template</a>
</li>
<li>
<a href="#browsers">Browser support</a>
</li>
<li>
<a href="#license-faqs">License FAQs</a>
</li>
<li>
<a href="#customizing">Customizing Bootstrap</a>
</li>