aboutsummaryrefslogtreecommitdiff
path: root/about.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-10-14 11:06:25 -0700
committerMark Otto <[email protected]>2013-10-14 11:06:25 -0700
commit6307d2c94d879e802610e366087bff75883d70a4 (patch)
tree1c43da1bf8d67c1fff25fe19033451176cd56ee3 /about.html
parent1f5c754d576f9534da2cc2176bf2193d31ed6937 (diff)
parent70278a4e4f6c2e9079d72a2993b69efd3a965ba0 (diff)
downloadbootstrap-6307d2c94d879e802610e366087bff75883d70a4.tar.xz
bootstrap-6307d2c94d879e802610e366087bff75883d70a4.zip
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: getting-started.html
Diffstat (limited to 'about.html')
-rw-r--r--about.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/about.html b/about.html
index e7bc38425..55ec4e871 100644
--- a/about.html
+++ b/about.html
@@ -28,22 +28,22 @@ base_url: "../"
<p class="lead">Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.</p>
<div class="list-group bs-team">
<a class="list-group-item team-member" href="https://github.com/mdo">
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=mdo&type=follow" width="120" height="20"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=mdo&amp;type=follow" width="120" height="20"></iframe>
<img src="http://www.gravatar.com/avatar/bc4ab438f7a4ce1c406aadc688427f2c" alt="@mdo">
<strong>Mark Otto</strong> <small>@mdo</small>
</a>
<a class="list-group-item team-member" href="https://github.com/fat">
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=fat&type=follow" width="120" height="20"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=fat&amp;type=follow" width="120" height="20"></iframe>
<img src="http://www.gravatar.com/avatar/a98244cbdacaf1c0b55499466002f7a8" alt="@fat">
<strong>Jacob Thornton</strong> <small>@fat</small>
</a>
<a class="list-group-item team-member" href="https://github.com/cvrebert">
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=cvrebert&type=follow" width="120" height="20"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=cvrebert&amp;type=follow" width="120" height="20"></iframe>
<img src="http://www.gravatar.com/avatar/edec428c425453955f770095a7d26c50" alt="@cvrebert">
<strong>Chris Rebert</strong> <small>@cvrebert</small>
</a>
<a class="list-group-item team-member" href="https://github.com/juthilo">
- <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=juthilo&type=follow" width="120" height="20"></iframe>
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=juthilo&amp;type=follow" width="120" height="20"></iframe>
<img src="http://www.gravatar.com/avatar/0f7dd3ce58a416be5685ea6194f82b11" alt="@juthilo">
<strong>Julian Thilo</strong> <small>@juthilo</small>
</a>
@@ -77,9 +77,9 @@ base_url: "../"
</div>
<p class="lead">Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.</p>
<ul>
- <li><a href="http://v3.bootcss.com/">Bootstrap in Chinese</a></li>
- <li><a href="http://bootstrap.oneskyapp.net/ru">Bootstrap in Russian</a></li>
- <li><a href="http://bootstrap.oneskyapp.net/es">Bootstrap in Spanish</a></li>
+ <li><a href="http://v3.bootcss.com/">Bootstrap 中文文档 (Chinese)</a></li>
+ <li><a href="http://bootstrap.oneskyapp.net/ru">Bootstrap по-русски (Russian)</a></li>
+ <li><a href="http://bootstrap.oneskyapp.net/es">Bootstrap en Español (Spanish)</a></li>
</ul>
<p>Have another language to add, or perhaps a different or better translation? Let us know by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a>.</p>
</div>