diff options
| author | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-11-29 22:35:58 -0800 |
| commit | cbb291b8ab316c3c0103da3c7b7a2c73596cfef2 (patch) | |
| tree | e632dc37d1f3dda4e91a06d4f671313a7e476187 /docs/base-css.html | |
| parent | b36df463108e2e4df8c389a06f577823564788d9 (diff) | |
| parent | 08d0aff19f8ad8fa2a9cfa389b8753c4525ea99c (diff) | |
| download | bootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.tar.xz bootstrap-cbb291b8ab316c3c0103da3c7b7a2c73596cfef2.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
bootstrap.min.css
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 48704cbd4..bab55f0e4 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -37,7 +37,7 @@ <li><a href="./scaffolding.html">Scaffolding</a></li> <li class="active"><a href="./base-css.html">Base CSS</a></li> <li><a href="./components.html">Components</a></li> - <li><a href="./javascript.html">Javascript</a></li> + <li><a href="./javascript.html">Javascript plugins</a></li> <li><a href="./less.html">Using LESS</a></li> </ul> </div> |