Merge branch 'master' into requirednumcopies
authorJoey Hess <joeyh@joeyh.name>
Wed, 6 Jan 2021 18:24:09 +0000 (14:24 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 6 Jan 2021 18:24:09 +0000 (14:24 -0400)
commit4694c2bb8753f6332319ece65009471ea9d36981
tree0079882af5697c0c10044fdcf49240682a4de227
parentcc896994572f19e0df77314c0cce7c3e88268322
parent8d8cdbec569e5982db3f744cf86277600a54df2d
Merge branch 'master' into requirednumcopies
doc/todo/lockContent_for_special_remotes.mdwn