From: Lyberta <lyberta@lyberta.net>
Date: Thu, 22 Feb 2018 03:39:00 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=659b41bb7b0c7a3cab6a03cf077d6cbe5e8c51df;p=xonotic%2Fxonotic-data.pk3dir.git

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

659b41bb7b0c7a3cab6a03cf077d6cbe5e8c51df