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)
# Conflicts:
#   .gitlab-ci.yml

1  2 
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/server/autocvars.qh
xonotic-server.cfg

Simple merge
Simple merge