]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5e6265 842683b)
Merge remote branch 'origin/master' into 1.2-wip
authorMark Otto <mark.otto@twitter.com>
Fri, 26 Aug 2011 23:08:03 +0000 (16:08 -0700)
committerMark Otto <mark.otto@twitter.com>
Fri, 26 Aug 2011 23:08:03 +0000 (16:08 -0700)

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