]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #13988 from twbs/fix-13896
authorChris Rebert <github@rebertia.com>
Mon, 30 Jun 2014 21:49:11 +0000 (14:49 -0700)
committerChris Rebert <github@rebertia.com>
Mon, 30 Jun 2014 21:49:11 +0000 (14:49 -0700)
doc that you can't use both data-ride and $().carousel() on the same carousel


Trivial merge