From: Lyberta <lyberta@lyberta.net>
Date: Tue, 12 Sep 2017 10:29:48 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db4bac641063f4c3486145fc8aaf930389ac50c8;p=xonotic%2Fxonotic-data.pk3dir.git

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

db4bac641063f4c3486145fc8aaf930389ac50c8