2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'master' into docs_derp

Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
This commit is contained in:
Mark Otto
2013-12-31 13:53:33 -08:00
113 changed files with 406 additions and 128 deletions
+15
View File
@@ -0,0 +1,15 @@
<li>
<a href="#brand">Brand guidelines</a>
</li>
<li>
<a href="#history">History</a>
</li>
<li>
<a href="#team">Team</a>
</li>
<li>
<a href="#community">Community</a>
</li>
<li>
<a href="#translations">Translations</a>
</li>