diff options
| author | Jacob Thornton <[email protected]> | 2012-01-31 13:23:29 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-31 13:23:29 -0800 |
| commit | b9de88890e3db18b48ef10cd5a718002cb5dc4a0 (patch) | |
| tree | 852e83d716eb715edb6cdc44ea24ab9bb6dca294 /docs/javascript.html | |
| parent | 0bfbe5058d61ae93d82b09f1dff7eb30dc22426e (diff) | |
| parent | cfc1c8a8cd69e86dc70a48766cd7cd318537dee3 (diff) | |
| download | bootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.tar.xz bootstrap-b9de88890e3db18b48ef10cd5a718002cb5dc4a0.zip | |
Merge branch '2.0-wip'
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 188d26e34..f45e67d9e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1288,7 +1288,7 @@ $('#myCollapsible').on('hidden', function () { <td>interval</td> <td>number</td> <td>5000</td> - <td>The amount of type to delay between automatically cycling an item.</td> + <td>The amount of time to delay between automatically cycling an item.</td> </tr> </tbody> </table> |