Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 24 Nov 2020 19:00:39 +0000 (15:00 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 24 Nov 2020 19:00:39 +0000 (15:00 -0400)

Trivial merge