Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
Conflicts: docs/templates/pages/index.mustache
This commit is contained in:
commit
fbc1ab14cc
2 changed files with 12 additions and 14 deletions
|
|
@ -135,8 +135,7 @@
|
|||
</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">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue