diff options
| author | Mark Otto <[email protected]> | 2012-10-01 23:41:00 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-10-01 23:41:00 -0700 |
| commit | 4ab7b77aa3750ffb64bfc544850c2722053ebbda (patch) | |
| tree | d5a71ca6a28de913596766c8df97d3ec2c92d353 /docs/customize.html | |
| parent | e6d6c7a413d69afc41c3c57b72f1b0dedfdbb516 (diff) | |
| parent | 7c9597f4e76d45571fab7a0e19d90b2fea8aab02 (diff) | |
| download | bootstrap-4ab7b77aa3750ffb64bfc544850c2722053ebbda.tar.xz bootstrap-4ab7b77aa3750ffb64bfc544850c2722053ebbda.zip | |
Merge branch '2.1.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.less
Diffstat (limited to 'docs/customize.html')
0 files changed, 0 insertions, 0 deletions