From: Lyberta <lyberta@lyberta.net>
Date: Fri, 9 Mar 2018 16:06:48 +0000 (+0300)
Subject: Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14f2ef754b7d625909f38da16dc0cbe7d26e0ebc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
---

14f2ef754b7d625909f38da16dc0cbe7d26e0ebc