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

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

59767f4f4ef1b7f29abdd73745a0f3b61ed07ea9