From: Mario <mario@smbclan.net>
Date: Thu, 31 May 2018 05:34:01 +0000 (+1000)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4afba1cb5f5e1526d4f8c26dae616b6bc32e9461;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

# Conflicts:
#	.gitlab-ci.yml
---

4afba1cb5f5e1526d4f8c26dae616b6bc32e9461