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

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

d3bb504a06869b18b46e66c47b571cdd4267cfdf