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

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	_layouts/default.html
	components.html
This commit is contained in:
Mark Otto
2013-12-21 11:17:29 -08:00
parent 07705673b6 5f9695ae7c
commit 02c40ab991
29 changed files with 931 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_includes/footer.html
+1
View File
@@ -5,6 +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>Maintained by the <a href="https://github.com/twbs?tab=members">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</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>