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

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

968bd31ddf0eb26dfa5597d76cf559a82931dbc0