]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd19b42 a0cd886)
Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip 3764/head
authorMarcus Schwab <marcus1060@gmail.com>
Mon, 11 Jun 2012 09:04:14 +0000 (02:04 -0700)
committerMarcus Schwab <marcus1060@gmail.com>
Mon, 11 Jun 2012 09:04:14 +0000 (02:04 -0700)

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