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

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

d1620598c4b0d418374f175889f1dfbfe877fa6f