From: fat Date: Tue, 22 Jul 2014 05:44:35 +0000 (-0700) Subject: Merge branch 'dropdown-aria' of git://github.com/mckramer/bootstrap into mckramer... X-Git-Tag: v3.3.0~306^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4775c9296ab95b49fc1e4b0f86d1db26176013ef;p=thirdparty%2Fbootstrap.git Merge branch 'dropdown-aria' of git://github.com/mckramer/bootstrap into mckramer-dropdown-aria Conflicts: docs/_includes/js/dropdowns.html --- 4775c9296ab95b49fc1e4b0f86d1db26176013ef diff --cc docs/_includes/js/dropdowns.html index 2cbbf85e19,2f03bddc14..2260bd38c3 --- a/docs/_includes/js/dropdowns.html +++ b/docs/_includes/js/dropdowns.html @@@ -20,10 -20,7 +20,10 @@@