From: Lyberta <lyberta@lyberta.net>
Date: Mon, 16 Jul 2018 12:19:34 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/AssaultIcons
X-Git-Tag: xonotic-v0.8.5~1948^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F576%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

25bfe79fe909550426d761d99ac65e38c59433ad