Commit 906ff986 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents a4901e2d 6ba341b2
Showing with 2 additions and 2 deletions
+2 -2
...@@ -16,7 +16,7 @@ title: Bootstrap ...@@ -16,7 +16,7 @@ title: Bootstrap
<a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a> <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
</li> </li>
<li> <li>
<a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> <a href="./docs/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
</li> </li>
<li>Version 3.0.0</li> <li>Version 3.0.0</li>
</ul> </ul>
...@@ -49,7 +49,7 @@ title: Bootstrap ...@@ -49,7 +49,7 @@ title: Bootstrap
</div> </div>
<h1>Built with Bootstrap.</h1> <h1>Built with Bootstrap.</h1>
<p class="marketing-byline">For more sites built with Bootstrap, <a href="http://expo.getbootstrap.com">visit the Expo</a> or <a href="./getting-started/#examples">browse the examples</a>.</p> <p class="marketing-byline">For more sites built with Bootstrap, <a href="http://expo.getbootstrap.com">visit the Expo</a> or <a href="./docs/#examples">browse the examples</a>.</p>
<div class="row bs-docs-gallery"> <div class="row bs-docs-gallery">
<div class="col-span-3"> <div class="col-span-3">
<a class="thumbnail" href="http://delicious.com" target="_blank"> <a class="thumbnail" href="http://delicious.com" target="_blank">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment