]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
authorMark Otto <markotto@twitter.com>
Tue, 6 Mar 2012 04:49:39 +0000 (20:49 -0800)
committerMark Otto <markotto@twitter.com>
Tue, 6 Mar 2012 04:49:39 +0000 (20:49 -0800)
commitac6eff280df58a96bfd429189d2dd2d6e5c38208
tree005d5538939c21c53bb911f7108b444c6b79be10
parent9c2b2c589da892bb15f276acc7d8f8707d4fc205
parentefd5e29ff46444e11cc1decc77fa53ed22a6b496
Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip

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