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

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

e1d235f2cc168724a7b5984ddf1a25d382539b3a