From: Lyberta <lyberta@lyberta.net>
Date: Thu, 9 Nov 2017 16:33:52 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3c94f99fd0994015e7a005afee6df4de0c0df89;p=xonotic%2Fxonotic-data.pk3dir.git

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

a3c94f99fd0994015e7a005afee6df4de0c0df89