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

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

75a74ff3dbce3d1f2476b480e06d3597f72c216b