diff options
| author | Mark Otto <[email protected]> | 2014-01-13 20:01:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-13 20:01:54 -0800 |
| commit | f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc (patch) | |
| tree | c75b7a1c96df2d5095a61fc838aead93b5c27849 /docs/_includes | |
| parent | df70e8d8458b63ca813466c9d8d0fa3aa2b716ff (diff) | |
| parent | 29e495f03cda05fd7fc362420ae86619c27b582e (diff) | |
| download | bootstrap-f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc.tar.xz bootstrap-f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc.zip | |
Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/nav-css.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html index a7ca471bd..5d37e35cb 100644 --- a/docs/_includes/nav-css.html +++ b/docs/_includes/nav-css.html @@ -99,6 +99,7 @@ <li><a href="#helper-classes-show-hide">Showing and hiding content</a></li> <li><a href="#helper-classes-screen-readers">Screen reader content</a></li> <li><a href="#helper-classes-image-replacement">Image replacement</a></li> + <li><a href="#helper-classes-embeds-responsive">Embeds responsive</a></li> </ul> </li> <li> |