Merge branch 'terencehill/shuffleteams_delay' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 12:05:32 +0000 (12:05 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 12:05:32 +0000 (12:05 +0000)
commit761fb981d742f869d7057a3bb7e3369329fdbe18
treee3f268ff4de5ca70e2b97cd81b9f0f372756b454
parentdf33af4f3b2347ecf28f744da7a2814c004b57cb
parent7a3925aa0b690560b5c59a840ccbb7b5641954e9
Merge branch 'terencehill/shuffleteams_delay' into 'master'

Shuffleteams delay

See merge request xonotic/xonotic-data.pk3dir!641
qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc