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

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

9be3f6510645395f6b6dbfab2e2f32d17f0bd8e3