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

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

81efd9fddb68ef826e291e513ac8ebca15c3a7f7