]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'dropdown-aria' of git://github.com/mckramer/bootstrap into mckramer... 14208/head
authorfat <jacobthornton@gmail.com>
Tue, 22 Jul 2014 05:44:35 +0000 (22:44 -0700)
committerfat <jacobthornton@gmail.com>
Tue, 22 Jul 2014 05:44:35 +0000 (22:44 -0700)
commit4775c9296ab95b49fc1e4b0f86d1db26176013ef
treebc97a0cadbe6baa255d9edb83e25c7b99a195c09
parent97cb2803d7698bdafc57820017ab8550b031d121
parentee12ce83057233d271f42162ef3dd2d42d315176
Merge branch 'dropdown-aria' of git://github.com/mckramer/bootstrap into mckramer-dropdown-aria

Conflicts:
docs/_includes/js/dropdowns.html
docs/_includes/js/dropdowns.html
js/dropdown.js