Merge branch 'master' of ssh://git-annex.branchable.com into master
authorJoey Hess <joeyh@joeyh.name>
Tue, 29 Sep 2020 16:12:25 +0000 (12:12 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 29 Sep 2020 16:12:25 +0000 (12:12 -0400)

Trivial merge