]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge pull request #11966 from colllin/noconflict
authorMark Otto <markdotto@gmail.com>
Thu, 1 May 2014 00:43:43 +0000 (17:43 -0700)
committerMark Otto <markdotto@gmail.com>
Thu, 1 May 2014 00:43:43 +0000 (17:43 -0700)
commitf20f66604b27d86ed132f7186560443e9603d313
tree68569600fd28238d8fc480fa90a809643519b916
parentabc797696d9f0b7ad5768092aedcc4620171bfe9
parenta9f2b6ce0fb2ac059e30da259f7ae25282803c09
Merge pull request #11966 from colllin/noconflict

Fix #11464 - JS noConflict() mode not working in 3.0.x
js/carousel.js
js/collapse.js
js/tests/unit/carousel.js