]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91b3935 d1e18e5)
Merge branch '3.0.0-wip' into gh-pages
authorMark Otto <otto@github.com>
Tue, 13 Aug 2013 23:11:26 +0000 (16:11 -0700)
committerMark Otto <otto@github.com>
Tue, 13 Aug 2013 23:11:26 +0000 (16:11 -0700)
Conflicts:
components.html


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git