From: Mario <mario.mario@y7mail.com>
Date: Wed, 23 Jun 2021 03:17:16 +0000 (+1000)
Subject: Merge branch 'master' into Mario/status_effects_extended
X-Git-Tag: xonotic-v0.8.5~393^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96d7859bf7144313cbe9c4582e8af355b02816f7;p=xonotic%2Fxonotic-data.pk3dir.git

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

96d7859bf7144313cbe9c4582e8af355b02816f7