]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
Merge branch 'dropupload-scan-on-startup-1458-1' into 2406.otf-objective-2.3.1
authorDavid Stainton <dstainton415@gmail.com>
Fri, 17 Apr 2015 18:20:03 +0000 (19:20 +0100)
committerDavid Stainton <dstainton415@gmail.com>
Fri, 17 Apr 2015 18:20:03 +0000 (19:20 +0100)
commit8117a1c4438313818870ce0132e10e37a00e081b
tree40b552bf2c66e3b8372e9c7476f7c424ce2def2c
parent48b00731185d636ce812a36b05e906be9dc3f6d6
parent5c514739cbd00d024ed5f3bd62d931405bc43f60
Merge branch 'dropupload-scan-on-startup-1458-1' into 2406.otf-objective-2.3.1

Conflicts:
src/allmydata/frontends/drop_upload.py
src/allmydata/test/test_drop_upload.py
src/allmydata/frontends/drop_upload.py
src/allmydata/test/test_drop_upload.py