From: Lyberta <lyberta@lyberta.net>
Date: Fri, 6 Oct 2017 19:28:35 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=752eaf3f03d3b56ecf8556bbb06ffed519303c71;p=xonotic%2Fxonotic-data.pk3dir.git

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

752eaf3f03d3b56ecf8556bbb06ffed519303c71