0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Merge branch 'master' into docs_derp

Conflicts:
	docs/_layouts/default.html
	docs/_layouts/home.html
This commit is contained in:
Mark Otto 2014-01-05 23:23:55 -08:00
commit 9421f0af82

View File

@ -10,6 +10,10 @@
<ul class="footer-links muted"> <ul class="footer-links muted">
<li>Currently v{{ site.current_version }}</li> <li>Currently v{{ site.current_version }}</li>
<li>&middot;</li> <li>&middot;</li>
<li><a href="{{ site.repo }}">GitHub</a></li>
<li>&middot;</li>
<li><a href="{{ site.baseurl }}getting-started/#examples">Examples</a></li>
<li>&middot;</li>
<li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li> <li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li>
<li>&middot;</li> <li>&middot;</li>
<li><a href="{{ page.base_url }}about/">About</a></li> <li><a href="{{ page.base_url }}about/">About</a></li>
@ -17,8 +21,6 @@
<li><a href="{{ site.expo }}">Expo</a></li> <li><a href="{{ site.expo }}">Expo</a></li>
<li>&middot;</li> <li>&middot;</li>
<li><a href="{{ site.blog }}">Blog</a></li> <li><a href="{{ site.blog }}">Blog</a></li>
<li>&middot;</li>
<li><a href="{{ site.repo }}">GitHub</a></li>
</ul> </ul>
</div> </div>
</footer> </footer>