From: Mario <zacjardine@y7mail.com>
Date: Mon, 28 Jan 2019 09:59:05 +0000 (+0000)
Subject: Merge branch 'martin-t/teamsay' into 'master'
X-Git-Tag: xonotic-v0.8.5~1636
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d89065f979aaf8985b739a1fb916d92cbcbfb0d4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/teamsay' into 'master'

Allow teamchat during intermission

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

d89065f979aaf8985b739a1fb916d92cbcbfb0d4