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

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

9b214b224ab7c2e4347af0ad05e431293e82e37b