diff options
| author | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
| commit | d2f1887bb5e7b651b11d6dd22ce191c733717a83 (patch) | |
| tree | 18aec6ab68ae29013e85a4a184baf33afa346769 /docs/about.html | |
| parent | e38fd138ce04d73e03100a3ea42496fc914120e9 (diff) | |
| parent | 9195d8e8eb51208e4272e4c7e0851e2695da1a0d (diff) | |
| download | bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.tar.xz bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.zip | |
Merge branch 'master' into pr/12388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/about.html')
| -rw-r--r-- | docs/about.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/about.html b/docs/about.html index 4aa3bc026..1195a08a0 100644 --- a/docs/about.html +++ b/docs/about.html @@ -88,7 +88,7 @@ lead: "Learn about the project's history, meet the maintaining teams, and find o </a> </div> </div> - <p>The <a href="{{ site.sass_repo }}">official Sass port of Bootstrap</a> was created and is maintained by this team. It became part of Bootstrap's organization with v3.1. Read the Sass <a href="https://github.com/twbs/bootstrap-sass/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how the Sass port is developed.</p> + <p>The <a href="{{ site.sass_repo }}">official Sass port of Bootstrap</a> was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.0. Read the Sass <a href="https://github.com/twbs/bootstrap-sass/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how the Sass port is developed.</p> </div> |