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

Trivial merge