Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
Conflicts: js/tests/unit/carousel.js
Showing
+40 -19
This source diff could not be displayed because it is too large. You can view the blob instead.
Please register or sign in to comment