From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 26 Aug 2020 23:34:43 +0000 (+0200)
Subject: Merge branch 'master' into 7drl2016
X-Git-Tag: TCE_proper_minor_fixes
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/static/bar%20baz.html?a=commitdiff_plain;h=refs%2Fheads%2F7drl2016;p=plomrogue

Merge branch 'master' into 7drl2016
---

d6659c644efbfaa3906c7ab36b17ca68c0dd1961