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

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

342252beeb11ccc2f967ae3255bd6ef53661b183