]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into...
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 18 Oct 2012 06:05:16 +0000 (23:05 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 18 Oct 2012 06:05:16 +0000 (23:05 -0700)
commit7f3b94c45315475a129ace3c22e122808c2dbcaa
tree0b963ce17c8bd8c5f43356da36015daee7295ede
parent280d4aeb30aa6b29ec74bd801ad1be3fc05e01f4
parente1f6458e3640a628cdb6b2e4c63950777d46e141
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document

Conflicts:
js/bootstrap-carousel.js
13 files changed:
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
js/bootstrap-carousel.js
js/bootstrap-modal.js
js/bootstrap-tab.js