Merge branch 'master' into borg
authorJoey Hess <joeyh@joeyh.name>
Fri, 18 Dec 2020 20:05:09 +0000 (16:05 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 18 Dec 2020 20:05:09 +0000 (16:05 -0400)
1  2 
Command/Sync.hs

diff --cc Command/Sync.hs
Simple merge