From: Lyberta <lyberta@lyberta.net>
Date: Sun, 11 Mar 2018 06:07:20 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7b33fc2dea9b90cef5bf08ff9a70f1b29c89b1e;p=xonotic%2Fxonotic-data.pk3dir.git

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

c7b33fc2dea9b90cef5bf08ff9a70f1b29c89b1e