]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
projects / tahoe-lafs / tahoe-lafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4977583 6da832c)
Merge remote-tracking branch 'upstream/2438.magic-folder-stable.5' into 2551.remote...
authorDavid Stainton <dstainton415@gmail.com>
Thu, 29 Oct 2015 08:59:37 +0000 (09:59 +0100)
committerDavid Stainton <dstainton415@gmail.com>
Thu, 29 Oct 2015 08:59:37 +0000 (09:59 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.