]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
projects / tahoe-lafs / tahoe-lafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 11fdd6d dd9eb96)
Merge branch '2438.magic-folder-stable.9' of https://github.com/tahoe-lafs/tahoe... 2438.magic-folder-stable.10
authorDaira Hopwood <daira@jacaranda.org>
Sat, 30 Jan 2016 23:31:11 +0000 (23:31 +0000)
committerDaira Hopwood <daira@jacaranda.org>
Sat, 30 Jan 2016 23:31:11 +0000 (23:31 +0000)
commit42aadf5cade6b6ee12f6718ff37118a41be2c57a
tree404392ee12554d27fa219249e720d05f4ba809bctree | snapshot
parent11fdd6d763608ceb21baa06109e3c8fa09476931commit | diff
parentdd9eb96421b47f0e6f822a4d3c2896071fb33f93commit | diff
Merge branch '2438.magic-folder-stable.9' of https://github.com/tahoe-lafs/tahoe-lafs into 2438.magic-folder-stable.10

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/frontends/magic_folder.py diff1 | diff2 | blob | history
src/allmydata/magicfolderdb.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.