From: bones_was_here <bones_was_here@xonotic.au>
Date: Wed, 31 May 2023 02:48:42 +0000 (+0000)
Subject: Merge branch 'drjaska/sync-bal-wep-mario' into 'master'
X-Git-Tag: xonotic-v0.8.6~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=983dadcd6efdec7d6ec6037c05d3f063e9eb41b7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/sync-bal-wep-mario' into 'master'

sync 2 vanilla changes to Mario's balance as per their preference

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

983dadcd6efdec7d6ec6037c05d3f063e9eb41b7