Merge branch 'master' of github.com:twbs/bootstrap

This commit is contained in:
Mark Otto 2014-01-27 09:42:33 -08:00
commit 45ea456468
1 changed files with 1 additions and 1 deletions

View File

@ -2034,7 +2034,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
<h1 id="affix" class="page-header">Affix <small>affix.js</small></h1> <h1 id="affix" class="page-header">Affix <small>affix.js</small></h1>
<h2 id="affix-examples">Example</h2> <h2 id="affix-examples">Example</h2>
<p>The subnavigation on the left is a live demo of the affix plugin.</p> <p>The subnavigation on the right is a live demo of the affix plugin.</p>
<hr class="bs-docs-separator"> <hr class="bs-docs-separator">