From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:37:03 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLyberta%2FSurvival;p=xonotic%2Fxonotic-data.pk3dir.git

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

29d7a75c4ec9756eae0680a109a69f6980a48fea