2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch 'master' into docs_derp

Conflicts:
	_config.yml
This commit is contained in:
Mark Otto
2013-12-26 21:40:15 -08:00
69 changed files with 847 additions and 340 deletions
+1
View File
@@ -20,6 +20,7 @@
</div>
<div class="container bs-docs-container">
<div class="row">
<div class="col-md-9" role="main">
{{ content }}