Merge branch 'master' into terencehill/bot_waypoints 670/head
authorMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:19:38 +0000 (14:19 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Aug 2019 04:19:38 +0000 (14:19 +1000)
# Conflicts:
# .gitlab-ci.yml

1  2 
qcsrc/server/command/cmd.qc
xonotic-client.cfg

Simple merge
Simple merge