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

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

ca6231b5cf7c4ea554a654ce8f6fffc4df0d10f6