diff options
| author | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
| commit | 9f2aeafe851bdca522b886c29afcece1ee0060e1 (patch) | |
| tree | be13d5ce0d68631543f28af8d9b444a7bd44917e /docs/_includes/footer.html | |
| parent | 7d9f55c3d5dcc5b12882af96245dab27be5fa346 (diff) | |
| parent | c5c67d0f54674dede58fc924d4d7c0f1d65705d9 (diff) | |
| download | bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.tar.xz bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
Diffstat (limited to 'docs/_includes/footer.html')
| -rw-r--r-- | docs/_includes/footer.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index f97aa72dd..4b485f885 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -4,7 +4,9 @@ <div class="bs-docs-container"> {% 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>. 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>. 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> + <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>.</p> + <p>Maintained by the <a href="https://github.com/orgs/twbs/people">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="bs-docs-footer-links muted"> <li>Currently v{{ site.current_version }}</li> <li>·</li> @@ -20,7 +22,7 @@ <li>·</li> <li><a href="{{ site.blog }}">Blog</a></li> <li>·</li> - <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li> + <li><a href="{{ site.repo }}/issues">Issues</a></li> <li>·</li> <li><a href="{{ site.repo }}/releases">Releases</a></li> </ul> |
