diff options
| author | Mark Otto <[email protected]> | 2014-04-30 19:48:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-04-30 19:48:22 -0700 |
| commit | 4c3ef52fc12519b59584a4696e6b3eca70551ce8 (patch) | |
| tree | 0341e4aeea9397b7a243e0424f40ea5655d05dca /docs/_includes/components | |
| parent | 17f77a5070fa090f351c882750c5cbb3a9c9e0d2 (diff) | |
| parent | 108b7c390efda6f9d56fb2749374a7999956b1a0 (diff) | |
| download | bootstrap-4c3ef52fc12519b59584a4696e6b3eca70551ce8.tar.xz bootstrap-4c3ef52fc12519b59584a4696e6b3eca70551ce8.zip | |
Merge branch 'pr/13320'
Conflicts:
dist/css/bootstrap-rtl.min.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap-rtl.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/components')
0 files changed, 0 insertions, 0 deletions