]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aaf80d4 bf3dea6)
Merge pull request #6472 from RWOverdijk/patch-1
authorMark Otto <markdotto@gmail.com>
Sat, 12 Jan 2013 08:21:08 +0000 (00:21 -0800)
committerMark Otto <markdotto@gmail.com>
Sat, 12 Jan 2013 08:21:08 +0000 (00:21 -0800)
Update composer.json


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