aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-12 14:52:54 -0700
committerMark Otto <[email protected]>2013-08-12 14:52:54 -0700
commit8a669bea2e82c2ba1f02b3232b41a2fb26661091 (patch)
tree8f2b703b553e706ece6db92cae82c7cc0439857a
parenteb1565681fc526c7f75b90ae3dae1d82b47eb4b6 (diff)
parent7c7c447d858d6d902848bfb602bf70d898813542 (diff)
downloadbootstrap-8a669bea2e82c2ba1f02b3232b41a2fb26661091.tar.xz
bootstrap-8a669bea2e82c2ba1f02b3232b41a2fb26661091.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
-rw-r--r--_includes/social-buttons.html4
-rw-r--r--index.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/_includes/social-buttons.html b/_includes/social-buttons.html
index b52cac2f6..cd4d921ea 100644
--- a/_includes/social-buttons.html
+++ b/_includes/social-buttons.html
@@ -1,10 +1,10 @@
<div class="bs-social">
<ul class="bs-social-buttons">
<li>
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px" title="Star on GitHub"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px" title="Star on GitHub"></iframe>
</li>
<li>
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px" title="Fork on GitHub"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px" title="Fork on GitHub"></iframe>
</li>
<li class="follow-btn">
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
diff --git a/index.html b/index.html
index 9ecf3f1ff..4582d8586 100644
--- a/index.html
+++ b/index.html
@@ -11,6 +11,6 @@ base_url: "./"
<p>
<a href="{{ site.download }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC2']);">Download latest BS3</a>
</p>
- <p><strong>Heads up!</strong> Downloads are pulled directly from the latest commited code on GitHub, and as a result our docs may at times be out of sync.</p>
+ <p><strong>Heads up!</strong> Downloads are pulled directly from the latest committed code on GitHub, and as a result our docs may at times be out of sync.</p>
</div>
</main>