An error occurred while loading the file. Please try again.

Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap ... · 7f3b94c4

Jacob Thornton authored 12 years ago

Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document

Conflicts:
	js/bootstrap-carousel.js

7f3b94c4