From: Mario <zacjardine@y7mail.com>
Date: Sun, 11 Aug 2019 12:05:32 +0000 (+0000)
Subject: Merge branch 'terencehill/shuffleteams_delay' into 'master'
X-Git-Tag: xonotic-v0.8.5~1404
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=761fb981d742f869d7057a3bb7e3369329fdbe18;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/shuffleteams_delay' into 'master'

Shuffleteams delay

See merge request xonotic/xonotic-data.pk3dir!641
---

761fb981d742f869d7057a3bb7e3369329fdbe18