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

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

65ba38c5228d8af26ac2b04b6e6e536a1772f446