diff options
| author | Mark Otto <[email protected]> | 2013-08-13 10:36:38 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 10:36:38 -0700 |
| commit | 33a88c9a94761a0371b0b3084de9009749033067 (patch) | |
| tree | 041e9e0b12b2d8904ede82aebc668fa03898f522 /javascript.html | |
| parent | 09b2a153fc7cefeeeeb728c3ace270a32583114f (diff) | |
| parent | 3e373a844c7763f513d1aec13fcd5da9d4bcd1e8 (diff) | |
| download | bootstrap-33a88c9a94761a0371b0b3084de9009749033067.tar.xz bootstrap-33a88c9a94761a0371b0b3084de9009749033067.zip | |
Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html index 63de81bea..3797dbf65 100644 --- a/javascript.html +++ b/javascript.html @@ -1781,7 +1781,7 @@ $('.carousel').carousel() <h4>.carousel(options)</h4> <p>Initializes the carousel with an optional options <code>object</code> and starts cycling through items.</p> -{% highlight html %} +{% highlight js %} $('.carousel').carousel({ interval: 2000 }) |