diff options
| author | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
| commit | f0d071832284d968f2cb72b0bb576f8112a349de (patch) | |
| tree | 9766c8da2b7c6890cdc794a2d93d4ca81c191047 /docs/_includes/nav-javascript.html | |
| parent | c5fb401a626c3e0d99a764cb7961e1bd3e619e8f (diff) | |
| parent | bfebf0e490c795601220f74b7089adb4f47acda7 (diff) | |
| download | bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.tar.xz bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.zip | |
Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
Diffstat (limited to 'docs/_includes/nav-javascript.html')
| -rw-r--r-- | docs/_includes/nav-javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html index 9422b27fb..13079580b 100644 --- a/docs/_includes/nav-javascript.html +++ b/docs/_includes/nav-javascript.html @@ -2,7 +2,7 @@ <a href="#js-overview">Overview</a> <ul class="nav"> <li><a href="#js-individual-compiled">Individual or compiled</a></li> - <li><a href="#js-data-attributes">Data attributes</a></li> + <li><a href="#js-data-attrs">Data attributes</a></li> <li><a href="#js-programmatic-api">Programmatic API</a></li> <li><a href="#js-noconflict">No Conflict</a></li> <li><a href="#js-events">Events</a></li> |