diff options
| author | Mark Otto <[email protected]> | 2012-09-25 22:00:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-25 22:00:41 -0700 |
| commit | ce19e63d5b068ba0698dee4e2d99c725f6799b0d (patch) | |
| tree | bda8377cdc83204780bdf624833725a127ded586 /docs/templates/layout.mustache | |
| parent | 527d01ce99a0cae8eae7868c0649dca60cda338c (diff) | |
| parent | f4d3d7da2e3ddbd751e053729935df1f3dd4c051 (diff) | |
| download | bootstrap-ce19e63d5b068ba0698dee4e2d99c725f6799b0d.tar.xz bootstrap-ce19e63d5b068ba0698dee4e2d99c725f6799b0d.zip | |
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/forms.less
less/mixins.less
Diffstat (limited to 'docs/templates/layout.mustache')
| -rw-r--r-- | docs/templates/layout.mustache | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index d463f441e..2f0e1e856 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -70,7 +70,7 @@ <a href="./components.html">{{_i}}Components{{/i}}</a> </li> <li class="{{javascript}}"> - <a href="./javascript.html">{{_i}}Javascript{{/i}}</a> + <a href="./javascript.html">{{_i}}JavaScript{{/i}}</a> </li> <li class="{{customize}}"> <a href="./customize.html">{{_i}}Customize{{/i}}</a> |