From: Lyberta <lyberta@lyberta.net>
Date: Thu, 5 Oct 2017 17:05:08 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=d463a67879bb0095ccf3cb14ef1625ba144f2c1d;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

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

d463a67879bb0095ccf3cb14ef1625ba144f2c1d