]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commit
Delete Water Dragons and include a brief discussion of conflict loops in the Fire...
authorDaira Hopwood <daira@jacaranda.org>
Fri, 29 May 2015 01:25:44 +0000 (02:25 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Fri, 29 May 2015 01:25:44 +0000 (02:25 +0100)
commit96e09e30beb027f24966fb1f0b8a6cd5e6cb86f7
tree80befa63f6caf66494b3dee3853ef48397b1e1f6
parent3d82893e1c3276eff28f6e06623f6c77d4032fbf
Delete Water Dragons and include a brief discussion of conflict loops in the Fire Dragon section.
Then rename Aether to Water.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
docs/proposed/magic-folder/remote-to-local-sync.rst