rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel

Browse source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-13 10:36:38 -07:00
commit 33a88c9a94
10 changed files with 245 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
javascript.html
View file

@ -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
})