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

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

2ec0c68734ebfd3d272f8dbf8a903e3b717a8bf0