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

Trivial merge