diff options
| author | Mark Otto <[email protected]> | 2013-08-17 14:16:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 14:16:40 -0700 |
| commit | 441e04c84a8a5dd4f55aad61c35c54aded41cc1d (patch) | |
| tree | 19ffb09d1f884c897f2ea32c39244954eaab02ca /_includes/nav-javascript.html | |
| parent | ffbec23c982de7496743212afb8d75005e52199c (diff) | |
| parent | 1b814ddd0a5768ff8ee85bef28f026e06fbace93 (diff) | |
| download | bootstrap-441e04c84a8a5dd4f55aad61c35c54aded41cc1d.tar.xz bootstrap-441e04c84a8a5dd4f55aad61c35c54aded41cc1d.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
dist/css/bootstrap.min.css
getting-started.html
Diffstat (limited to '_includes/nav-javascript.html')
| -rw-r--r-- | _includes/nav-javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_includes/nav-javascript.html b/_includes/nav-javascript.html index 365fe1a10..e97027096 100644 --- a/_includes/nav-javascript.html +++ b/_includes/nav-javascript.html @@ -4,7 +4,7 @@ <li><a href="#js-individual-compiled">Individual or compiled</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-noconflict">No conflict</a></li> <li><a href="#js-events">Events</a></li> </ul> </li> |