]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge pull request #8939 from frabrunelle/3.0.0-wip
authorMark Otto <markdotto@gmail.com>
Sat, 3 Aug 2013 02:58:17 +0000 (19:58 -0700)
committerMark Otto <markdotto@gmail.com>
Sat, 3 Aug 2013 02:58:17 +0000 (19:58 -0700)
add nav to media object and thumbnails

1  2 
_includes/nav-components.html
components.html

Simple merge
diff --cc components.html
Simple merge