diff options
| author | Mark Otto <[email protected]> | 2013-11-22 22:09:04 -0500 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-22 22:09:04 -0500 |
| commit | 98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3 (patch) | |
| tree | 1eb37ecb58bc71628504273161dd0bb11dd4753e /components.html | |
| parent | 37f3944bd9a1cc2b7cb2dda6f767b708daab5fc1 (diff) | |
| parent | 4c246c0117ea56cb10b91b635ff415ec20d9c97d (diff) | |
| download | bootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.tar.xz bootstrap-98980b0fb2ebc813ac7cdb7b47dafd95c9d35db3.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components.html b/components.html index f991cccda..53a788f3f 100644 --- a/components.html +++ b/components.html @@ -3160,7 +3160,7 @@ body { padding-bottom: 70px; } <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image"> </a> <div class="media-body"> - <h4 class="media-heading">Media heading</h4> + <h4 class="media-heading">Nested media heading</h4> Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus. </div> </div> |