From: Lyberta <lyberta@lyberta.net>
Date: Sun, 27 Aug 2017 23:46:11 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6cfb2fef5b6b6b5c4a936bf077379ba9d532f628;p=xonotic%2Fxonotic-data.pk3dir.git

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

6cfb2fef5b6b6b5c4a936bf077379ba9d532f628