]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5949b8e e91a74e)
resolve conflict
authorMark Otto <markdotto@gmail.com>
Tue, 28 Jun 2011 21:30:48 +0000 (14:30 -0700)
committerMark Otto <markdotto@gmail.com>
Tue, 28 Jun 2011 21:30:48 +0000 (14:30 -0700)

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