]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jan 2012 22:31:10 +0000 (14:31 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jan 2012 22:31:10 +0000 (14:31 -0800)
Conflicts:
docs/templates/pages/index.mustache

1  2 
docs/index.html
docs/templates/pages/index.mustache

diff --cc docs/index.html
index d0c0bcae602bf6320dfa21e4b1a9fe16b7f549fb,1743676b6c83fd0056f7551114d46c12db8472a3..aea901cb5d7a7bdb29d57a81d3949c7ac0f5edc5
                </a>
              </li>
            </ul>
--
-           <h1Designed for everyone, everywhere.</h1>
+           <h1>Designed for everyone, everywhere.</h1>
            <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
            <div class="row">
              <div class="span4">
index 1e77d4a25a9471d3cf1143e802c7cdf870e1ef9b,072ed6da6af3883a6ae12f07f733fe50d1b78678..8cf9261236ec84093851d140ab569b0b2f7b7a2c
@@@ -75,8 -75,8 +75,7 @@@
                </a>
              </li>
            </ul>
--
-           <h1{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
+           <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
            <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
            <div class="row">
              <div class="span4">