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

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

d667bd3d0e04fbf2810642025fc22e7db36d43ba