From: Mark Otto <otto@github.com>
Date: Thu, 19 Dec 2013 00:19:46 +0000 (-0800)
Subject: Merge branch 'master' into docs_derp
X-Git-Tag: v3.1.0~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07705673b6398ae9cfe2cb59b97d61e04efeb8bf;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into docs_derp

Conflicts:
	_layouts/default.html
---

07705673b6398ae9cfe2cb59b97d61e04efeb8bf
diff --cc _includes/footer.html
index ce6d07703e,095e96eb59..fcea91b146
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@@ -1,27 -1,3 +1,27 @@@
 +<!-- Footer
 +================================================== -->
 +<footer class="bs-footer" role="contentinfo">
 +  <div class="container">
 +    {% 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>
 +      <li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ page.base_url }}about/">About</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.blog }}">Blog</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.repo }}/releases">Releases</a></li>
 +    </ul>
 +  </div>
 +</footer>
 +
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->