From: Lyberta <lyberta@lyberta.net>
Date: Thu, 1 Jun 2017 13:10:23 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=88e05e4b19e3d43d41fa740076a4f02ed781dee6;p=xonotic%2Fxonotic-data.pk3dir.git

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

88e05e4b19e3d43d41fa740076a4f02ed781dee6