From: Mario <zacjardine@y7mail.com>
Date: Wed, 25 Apr 2018 13:08:10 +0000 (+0000)
Subject: Merge branch 'master' into 'terencehill/bot_waypoints'
X-Git-Tag: xonotic-v0.8.5~2174^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38c2e33f2b643b4e9d1878ceb3330cc05406edcc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into 'terencehill/bot_waypoints'

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

38c2e33f2b643b4e9d1878ceb3330cc05406edcc