]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
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)
commitb0dd570c5130569ffd8b24ee17253e26ba71aee7
treed1a2e489e8bbd8a09d7c33bf57eab17fd45eccf1
parent4977583fc43f93355554eb550ba62dcf97baa651
parent6da832cf140a4c560cf7f767f79ed6dd70ecdd65
Merge remote-tracking branch 'upstream/2438.magic-folder-stable.5' into 2551.remote-conflict-detection.3