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

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

09684dc4527b48eefa11386c5adfc9cbba3b13bb