]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
projects / tahoe-lafs / tahoe-lafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fb55baa) | patch
WIP Merge branch '1710.actually-unlink-files.0' of https://github.com/meejah/tahoe... 2521.magic-db-schema.1.wip
authorDaira Hopwood <daira@jacaranda.org>
Mon, 19 Oct 2015 14:14:28 +0000 (15:14 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Mon, 19 Oct 2015 14:14:28 +0000 (15:14 +0100)
commitcfb23549bdf0b957a6143a600171845d50df7579
tree64b561b767ff55a1001d34e8ddeb3530ae8cfee7tree | snapshot
parentfb55baa91b879f70fe6b68acf12b105554a33460commit | diff
WIP Merge branch '1710.actually-unlink-files.0' of https://github.com/meejah/tahoe-lafs into 2521.magic-db-schema.1

# Conflicts:
# src/allmydata/frontends/magic_folder.py
# src/allmydata/test/test_magic_folder.py
Makefile diff | blob | history
src/allmydata/frontends/magic_folder.py diff | blob | history
src/allmydata/test/check_magicfolder_smoke.py [new file with mode: 0644] blob
src/allmydata/test/test_magic_folder.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.