From: terencehill <piuntn@gmail.com>
Date: Fri, 8 Apr 2022 12:37:02 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/welcome_dialog_translatable
X-Git-Tag: xonotic-v0.8.5~81^2~1
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=6f3a2d52796c4bb7cb689188e2fe5a733ad49d7c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/welcome_dialog_translatable
---

6f3a2d52796c4bb7cb689188e2fe5a733ad49d7c