diff options
| author | Mark Otto <[email protected]> | 2014-02-08 15:37:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 15:37:35 -0800 |
| commit | c8315edd7397cd3b836da67d50a7c5d7eb7de90c (patch) | |
| tree | a8f2a3f4e6682e540aef63dd00b6dcfb13f355ae /docs/_includes | |
| parent | a0052b5a3745737777c88409ae08585ce75b285b (diff) | |
| parent | 91b76e5247ef259b8c51672ed95dbbcfd08b7aac (diff) | |
| download | bootstrap-c8315edd7397cd3b836da67d50a7c5d7eb7de90c.tar.xz bootstrap-c8315edd7397cd3b836da67d50a7c5d7eb7de90c.zip | |
Merge branch 'master' into pr/12639
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/nav-components.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index 4348bcf00..a7ec8a240 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -102,7 +102,7 @@ <a href="#progress">Progress bars</a> <ul class="nav"> <li><a href="#progress-basic">Basic example</a></li> - <li><a href="#progress-labels">With label</a></li> + <li><a href="#progress-label">With label</a></li> <li><a href="#progress-alternatives">Contextual alternatives</a></li> <li><a href="#progress-striped">Striped</a></li> <li><a href="#progress-animated">Animated</a></li> |