]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Thu, 6 Jun 2019 21:18:22 +0000 (17:18 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 6 Jun 2019 21:18:22 +0000 (17:18 -0400)

Trivial merge