]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'accessibility' into 2.1.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sat, 2 Jun 2012 23:11:35 +0000 (16:11 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sat, 2 Jun 2012 23:11:35 +0000 (16:11 -0700)
commit5e5965ca6fe719e83f5eb06222170b87dba78f02
treefa6723ece71b5f733d608c6228521609a4adbd99
parentebc69356637143c938c07904d10928c11e742196
parentb1d7c34086ec95a2b0507c595e3a353cdc550b9b
Merge branch 'accessibility' into 2.1.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
js/bootstrap-dropdown.js
js/bootstrap-modal.js
less/dropdowns.less
less/navbar.less