]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96a19c1 bb30f63)
Merge branch 'master' into navbar-button-docs 11096/head
authorMark Otto <otto@github.com>
Thu, 17 Oct 2013 21:47:31 +0000 (14:47 -0700)
committerMark Otto <otto@github.com>
Thu, 17 Oct 2013 21:47:31 +0000 (14:47 -0700)
1  2 
components.html patch | diff1 | diff2 | blob | history

diff --cc components.html
Simple merge
Mirror of https://github.com/twbs/bootstrap.git