]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.2-wip' into exploratory
authorMark Otto <markotto@twitter.com>
Tue, 2 Oct 2012 06:41:00 +0000 (23:41 -0700)
committerMark Otto <markotto@twitter.com>
Tue, 2 Oct 2012 06:41:00 +0000 (23:41 -0700)
commit4ab7b77aa3750ffb64bfc544850c2722053ebbda
treed5a71ca6a28de913596766c8df97d3ec2c92d353
parente6d6c7a413d69afc41c3c57b72f1b0dedfdbb516
parent7c9597f4e76d45571fab7a0e19d90b2fea8aab02
Merge branch '2.1.2-wip' into exploratory

Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.less
docs/assets/css/bootstrap.css
docs/components.html
docs/javascript.html
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/dropdowns.less
less/forms.less
less/labels-badges.less
less/mixins.less
less/responsive-767px-max.less
less/tables.less