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 | 43da258bd9e67e0aaa850bd92c95937f7d586796 (patch) | |
| tree | 21dd1a45f52eba75b11a0dd6770d9d3aed28e685 /docs/javascript.html | |
| parent | e4a74607b02f81e8007ac9903da1e6eddd8a5692 (diff) | |
| parent | c97d304c0ca0c3b11f2c550590b54a75b41471fb (diff) | |
| download | bootstrap-43da258bd9e67e0aaa850bd92c95937f7d586796.tar.xz bootstrap-43da258bd9e67e0aaa850bd92c95937f7d586796.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 'docs/javascript.html')
0 files changed, 0 insertions, 0 deletions