diff options
| author | Mark Otto <[email protected]> | 2012-12-28 13:08:49 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-28 13:08:49 -0600 |
| commit | 6f8e315b1dd5a478630b365733b49e1765e96283 (patch) | |
| tree | e13c4926caa5c97b5bdd8d1eebcda9ae8383c336 /docs/base-css.html | |
| parent | 330b143b407b01d71b707860f21e0cc2accafd49 (diff) | |
| parent | 3096a377a28627fae8b8fbdd543b7ab140b86929 (diff) | |
| download | bootstrap-6f8e315b1dd5a478630b365733b49e1765e96283.tar.xz bootstrap-6f8e315b1dd5a478630b365733b49e1765e96283.zip | |
Merge branch 'sparanoid-transition-duration' into 2.3.0-wip
Conflicts:
docs/assets/img/bootstrap-docs-readme.png
Diffstat (limited to 'docs/base-css.html')
0 files changed, 0 insertions, 0 deletions