From: Lyberta <lyberta@lyberta.net>
Date: Sun, 29 Jul 2018 17:28:13 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GamemodesSplit
X-Git-Tag: xonotic-v0.8.5~1919^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a777777c509053f4b6b132168fbef5044892200;p=xonotic%2Fxonotic-data.pk3dir.git

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

5a777777c509053f4b6b132168fbef5044892200