diff options
| author | Mark Otto <[email protected]> | 2013-02-01 10:34:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-01 10:34:25 -0800 |
| commit | 2553d74b5459a3093e3dd42eecd9766005c024be (patch) | |
| tree | 30f3660cc35e5920ff5a16792439debb909d6d5d /docs/components.html | |
| parent | 725cf7f6ec37668fab0ec8f59ae748feff5335f1 (diff) | |
| parent | 7d655c35494012f15bc1f9ae515e92ca4c432a66 (diff) | |
| download | bootstrap-2553d74b5459a3093e3dd42eecd9766005c024be.tar.xz bootstrap-2553d74b5459a3093e3dd42eecd9766005c024be.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/examples/hero.html
docs/examples/sticky-footer-navbar.html
Diffstat (limited to 'docs/components.html')
0 files changed, 0 insertions, 0 deletions