aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-18 19:04:18 -0800
committerMark Otto <[email protected]>2013-12-18 19:04:18 -0800
commit87727370e06c1deba7d7aa7196a480cef293a047 (patch)
tree7e645a1fd8bb473c8136ceb3472c90c12db1df21
parent4eaa297e683ffb1e0718ea2d77d2babfae1863bc (diff)
parent07da1d731a7117e1281b43e6c79c441dc47e9e48 (diff)
downloadbootstrap-87727370e06c1deba7d7aa7196a480cef293a047.tar.xz
bootstrap-87727370e06c1deba7d7aa7196a480cef293a047.zip
Merge pull request #11929 from twbs/maintainers
mention core team maintenance & community contributors
-rw-r--r--README.md2
-rw-r--r--_layouts/default.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index b973ff48a..d8fb52925 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
[![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
-Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
+Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community.
To get started, check out <http://getbootstrap.com>!
diff --git a/_layouts/default.html b/_layouts/default.html
index e140d1ae2..bcec8661c 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -57,6 +57,7 @@
{% include social-buttons.html %}
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
+ <p>Maintained by the <a href="https://github.com/twbs?tab=members">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
<p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links">
<li>Currently v{{ site.current_version }}</li>