From: Mario <mario.mario@y7mail.com>
Date: Tue, 26 May 2020 14:04:38 +0000 (+1000)
Subject: Merge branch 'master' into Mario/pure_entity_fix
X-Git-Tag: xonotic-v0.8.5~1023^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f7673c11a5261668cc3e3896391fafd546168994;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/pure_entity_fix
---

f7673c11a5261668cc3e3896391fafd546168994