From: terencehill <piuntn@gmail.com>
Date: Sun, 16 Oct 2022 19:53:24 +0000 (+0000)
Subject: Merge branch 'drjaska/ca-less-stalemates' into 'master'
X-Git-Tag: xonotic-v0.8.6~321
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09863d6d67bf29444a834a8b585b3cb212ede8d5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/ca-less-stalemates' into 'master'

New opt-in feature for less stalemates in CA when round timer runs out

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

09863d6d67bf29444a834a8b585b3cb212ede8d5