]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'bartt-master' into 2.0.3-wip
authorMark Otto <markotto@twitter.com>
Sat, 24 Mar 2012 03:56:48 +0000 (20:56 -0700)
committerMark Otto <markotto@twitter.com>
Sat, 24 Mar 2012 03:56:48 +0000 (20:56 -0700)
commitf9f03d8976710b8aa10abd5f89c0a699758ff0a0
treeaa228bbcddc6a7a3f9137c8c75dd753e72cd4ea8
parentf87e4c60e9bb33f29bffed702af797b322821b8f
parentc7afe382a26834cce5b8bf2fc7333ce7e945a2d4
Merge branch 'bartt-master' into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/button-groups.less
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/button-groups.less
less/forms.less
less/mixins.less