diff options
| author | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-07 18:36:27 -0800 |
| commit | 06f1293acfc767d950adc329cf4abfc2b5c0b78d (patch) | |
| tree | 738abb0672d3e0a5839a8657c431a202aa190ef0 /docs/_includes | |
| parent | d91d9b0ade9165c20d781ced128a751d0ae1fbda (diff) | |
| parent | a2f08158d032c1025ca0c6bf411b8282b606fb7b (diff) | |
| download | bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.tar.xz bootstrap-06f1293acfc767d950adc329cf4abfc2b5c0b78d.zip | |
Merge branch 'master' into panels_and_tables
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> |