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

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

28122b5b791363c07db22a6666d3ba15a6e33bf5