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

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

32bf29b4c835c45335ff3f88dc4eeda9223a391a