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

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

323f9380d025ff10c351896e08c4ca4c6f5e998d