diff options
| author | Mark Otto <[email protected]> | 2012-01-24 16:09:32 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-24 16:09:32 -0800 |
| commit | 7e6797880a969de8b3d44be91dbc765b6ab48612 (patch) | |
| tree | 6078fa9bad27d829eaeb6bf9016399a8f75702e1 /docs/templates/pages/javascript.mustache | |
| parent | 8ff621aa26dee69088b527089cdd719bce68be31 (diff) | |
| parent | 03d2128f5072791ca4578a4e50a4540df7c9d121 (diff) | |
| download | bootstrap-7e6797880a969de8b3d44be91dbc765b6ab48612.tar.xz bootstrap-7e6797880a969de8b3d44be91dbc765b6ab48612.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/index.html
docs/templates/pages/index.mustache
Diffstat (limited to 'docs/templates/pages/javascript.mustache')
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index c85b9d2a2..763fe8aa1 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -646,7 +646,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <tr> <th style="width: 100px;">{{_i}}Name{{/i}}</th> <th style="width: 100px;">{{_i}}type{{/i}}</th> - <th style="width: 50px;"{{_i}}>default{{/i}}</th> + <th style="width: 50px;">{{_i}}default{{/i}}</th> <th>{{_i}}description{{/i}}</th> </tr> </thead> |