From: terencehill Date: Wed, 23 Jun 2021 14:41:38 +0000 (+0000) Subject: Merge branch 'Mario/status_effects_extended' into 'master' X-Git-Tag: xonotic-v0.8.5~393 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f61d242872ea00cd4eb0cd65b0ec1bef639ae4fe;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'Mario/status_effects_extended' into 'master' Merge branch Mario/status_effects_extended (XL merge request) See merge request xonotic/xonotic-data.pk3dir!916 --- f61d242872ea00cd4eb0cd65b0ec1bef639ae4fe