]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)
committerMark Otto <markotto@twitter.com>
Mon, 20 Feb 2012 00:00:54 +0000 (16:00 -0800)
commitf4f34ab12f0f89e6a11f6b752ab82fb01bd746d4
tree1fd89eb7715f4acff7e48a077fcd5413e39f0079
parent59d570fc160c71dc21f77735e9d14797e247d859
parent1e6d386b8df2d7235b23a96ddd0489c1ab2650dc
Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/buttons.less