From: terencehill <piuntn@gmail.com>
Date: Sun, 12 Sep 2021 11:49:33 +0000 (+0000)
Subject: Merge branch 'drjaska/electrorefirefix' into 'master'
X-Git-Tag: xonotic-v0.8.5~351
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=56d4b0ec9ee77df2b7703fe169daea67f8e093a0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/electrorefirefix' into 'master'

Fix inconsistency with electro refire time

Closes #2569

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

56d4b0ec9ee77df2b7703fe169daea67f8e093a0