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

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

a72cab626fc2c2373aa15c08dd7a76767a90fcf1