]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 465ff83 97848e5)
Merge branch 'martin-t/teamsay' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 28 Jan 2019 09:59:05 +0000 (09:59 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 28 Jan 2019 09:59:05 +0000 (09:59 +0000)
Allow teamchat during intermission

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


Trivial merge