]> 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: b1d7ea0 ddc293c)
Merge branch '2454.magic-folder-create-tool.2' into 1710.local-deletion-water-dragon.1
authorDavid Stainton <dstainton415@gmail.com>
Wed, 24 Jun 2015 19:52:58 +0000 (12:52 -0700)
committerDavid Stainton <dstainton415@gmail.com>
Wed, 24 Jun 2015 19:52:58 +0000 (12:52 -0700)

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