From: Mario <mario.mario@y7mail.com>
Date: Mon, 13 Apr 2020 13:45:11 +0000 (+1000)
Subject: Merge branch 'master' into Mario/strength_stat_field
X-Git-Tag: xonotic-v0.8.5~1089^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d841a3f6bd4c6af2da0506828c84063933d80ca1;p=xonotic%2Fxonotic-data.pk3dir.git

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

d841a3f6bd4c6af2da0506828c84063933d80ca1