diff options
| author | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-05 11:05:10 -0800 |
| commit | cb67366206b318c183b00f6bc6f30652518147b8 (patch) | |
| tree | c82c6333920b06b6875c0691ed2462840281cdfb /carousel/example.css | |
| parent | 145ed23ac5d1c50e76727889cc54948bf80058d2 (diff) | |
| parent | 5cf2e8a1cbd86a2c3c4d3683c2ffda248eb27355 (diff) | |
| download | bootstrap-cb67366206b318c183b00f6bc6f30652518147b8.tar.xz bootstrap-cb67366206b318c183b00f6bc6f30652518147b8.zip | |
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
Diffstat (limited to 'carousel/example.css')
0 files changed, 0 insertions, 0 deletions