mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	_layouts/default.html
This commit is contained in:
Mark Otto
2013-12-18 16:19:46 -08:00
parent bc265ac647 3315d4d9f4
commit 07705673b6
34 changed files with 181 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_includes/footer.html
+1 -1
View File
@@ -5,7 +5,7 @@
{% include social-buttons.html %}
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links muted">
<li>Currently v{{ site.current_version }}</li>
<li>&middot;</li>