diff options
| author | Mark Otto <[email protected]> | 2013-12-21 11:17:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-21 11:17:29 -0800 |
| commit | 02c40ab9919ee87ec8f7688133cc71f64f460013 (patch) | |
| tree | 350491788234da822d8fc9dfcaf6c31b7599cdcc /_includes | |
| parent | 07705673b6398ae9cfe2cb59b97d61e04efeb8bf (diff) | |
| parent | 5f9695ae7cf66dd7f07a3cb3eb534e838d18c62b (diff) | |
| download | bootstrap-02c40ab9919ee87ec8f7688133cc71f64f460013.tar.xz bootstrap-02c40ab9919ee87ec8f7688133cc71f64f460013.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_layouts/default.html
components.html
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index fcea91b14..d9c8e2052 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,6 +5,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 muted"> <li>Currently v{{ site.current_version }}</li> |