Merge branch 'master' of git.dn42.dev:wiki/wiki

Marek Küthe committed 2022-06-06 20:45:34 +0200 commit 5cf73841881c4248d2b7f9861bf9bf60ded815eb