aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-05 20:49:39 -0800
committerMark Otto <[email protected]>2012-03-05 20:49:39 -0800
commitac6eff280df58a96bfd429189d2dd2d6e5c38208 (patch)
tree005d5538939c21c53bb911f7108b444c6b79be10 /docs/components.html
parent9c2b2c589da892bb15f276acc7d8f8707d4fc205 (diff)
parentefd5e29ff46444e11cc1decc77fa53ed22a6b496 (diff)
downloadbootstrap-ac6eff280df58a96bfd429189d2dd2d6e5c38208.tar.xz
bootstrap-ac6eff280df58a96bfd429189d2dd2d6e5c38208.zip
Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
Conflicts: less/dropdowns.less
Diffstat (limited to 'docs/components.html')
0 files changed, 0 insertions, 0 deletions