]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #14061 from hnrch02/fix-13656
authorJacob <jacobthornton@gmail.com>
Fri, 1 Aug 2014 19:50:03 +0000 (12:50 -0700)
committerJacob <jacobthornton@gmail.com>
Fri, 1 Aug 2014 19:50:03 +0000 (12:50 -0700)
Expose transition durations on plugin constructors; closes #13656

1  2 
js/carousel.js
js/tooltip.js

diff --cc js/carousel.js
Simple merge
diff --cc js/tooltip.js
Simple merge