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

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

d202232d3d4f96910b140478e6d25a2e25a8d079