From: Lyberta <lyberta@lyberta.net>
Date: Mon, 8 Jan 2018 16:08:44 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=006b15bb5b7072fd09cbf69f1951242d623fe7f6;p=xonotic%2Fxonotic-data.pk3dir.git

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

006b15bb5b7072fd09cbf69f1951242d623fe7f6