From: Mario <mario@smbclan.net>
Date: Thu, 29 Aug 2019 04:19:38 +0000 (+1000)
Subject: Merge branch 'master' into terencehill/bot_waypoints
X-Git-Tag: xonotic-v0.8.5~1356^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19794b31e782cca0f5a0d916bc5fd4dc6156eeaf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/bot_waypoints

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

19794b31e782cca0f5a0d916bc5fd4dc6156eeaf