diff options
| author | Mark Otto <[email protected]> | 2013-02-05 19:53:44 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 19:53:44 -0800 |
| commit | 3db1b902c8a5905a382a572c7b54776b10ca2e6b (patch) | |
| tree | 29669f5d5c9ad0c3d7b4c31360550e543a115271 /carousel.html | |
| parent | e4aa1fcef4e4a7b9830ff13a204170478695c1bb (diff) | |
| parent | 0a8d834af61725a61ca7fbc917dd4ae1d36f0769 (diff) | |
| download | bootstrap-3db1b902c8a5905a382a572c7b54776b10ca2e6b.tar.xz bootstrap-3db1b902c8a5905a382a572c7b54776b10ca2e6b.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
Diffstat (limited to 'carousel.html')
0 files changed, 0 insertions, 0 deletions