From: bones_was_here <bones_was_here@xa.org.au>
Date: Thu, 24 Mar 2022 20:11:29 +0000 (+0000)
Subject: Merge branch 'z411/new_timer_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~138
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b3b1685fd604e9984f7a68816332d103914a47b0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'z411/new_timer_fix' into 'master'

Fixed timer in unlimited warmup

Closes #2676

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

b3b1685fd604e9984f7a68816332d103914a47b0