diff options
| author | fat <[email protected]> | 2013-07-18 01:08:19 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-18 01:08:19 -0700 |
| commit | 6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340 (patch) | |
| tree | 8480da0e7c249bf59f6a13e9f108d1429e1d4741 /docs/_includes | |
| parent | 4b40ee692dc066f2ad3c4dd96af67a83475f5cbe (diff) | |
| parent | 181b27677492050adceaa52fe972115515759f07 (diff) | |
| download | bootstrap-6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340.tar.xz bootstrap-6ec8a1e44f6b58ed57d015916a4fe39bfb0e2340.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/nav-components.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index ed00b62fa..514dcfed3 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -3,6 +3,7 @@ <ul class="nav"> <li><a href="#dropdowns-example">Example</a></li> <li><a href="#dropdowns-alignment">Alignment options</a></li> + <li><a href="#dropdowns-headers">Headers</a></li> <li><a href="#dropdowns-disabled">Disabled menu items</a></li> </ul> </li> |