From: Mario <mario.mario@y7mail.com>
Date: Wed, 30 Oct 2024 10:46:03 +0000 (+1000)
Subject: Merge branch 'Mario/electro_combo_over_time_effect' into Mario/electro_combo_over_time
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b50d026c767eaf1a6d5c21b2f4e5feecfb2bfa3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/electro_combo_over_time_effect' into Mario/electro_combo_over_time
---

7b50d026c767eaf1a6d5c21b2f4e5feecfb2bfa3