Merge branch 'master' into 'terencehill/bot_waypoints' 553/head
authorMario <zacjardine@y7mail.com>
Wed, 25 Apr 2018 13:08:10 +0000 (13:08 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 25 Apr 2018 13:08:10 +0000 (13:08 +0000)
commit38c2e33f2b643b4e9d1878ceb3330cc05406edcc
treed24bb717059e2ce75ec192c6496067007d354a31
parent5b5056da28ddb2b28dcfe6bf7cd8a9225a6f3a03
parentc2f067fea43512b93f76dee00ba5eb11d7215c93
Merge branch 'master' into 'terencehill/bot_waypoints'

# Conflicts:
#   .gitlab-ci.yml
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/server/autocvars.qh
xonotic-server.cfg