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

Marek Küthe committed 2022-06-04 00:46:10 +0200 commit 7a214f7aecc2a82138bbb00f9bbfe5b7f115314e