From: Chris Rebert Date: Mon, 30 Jun 2014 21:49:11 +0000 (-0700) Subject: Merge pull request #13988 from twbs/fix-13896 X-Git-Tag: v3.3.0~421 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8deab3a95d24afa795c428572b7bfadbc7fb9ac5;p=thirdparty%2Fbootstrap.git Merge pull request #13988 from twbs/fix-13896 doc that you can't use both data-ride and $().carousel() on the same carousel --- 8deab3a95d24afa795c428572b7bfadbc7fb9ac5