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

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

cc77b45073dfdaa54be3d60e6e5a79307a1c76e7