From: terencehill <piuntn@gmail.com>
Date: Fri, 20 May 2022 23:36:02 +0000 (+0000)
Subject: Merge branch 'drjaska/minefix2' into 'master'
X-Git-Tag: xonotic-v0.8.5~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2272e7fed22104d84e3790ce4c4c08d6e228675c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'drjaska/minefix2' into 'master'

fix #2690 by making sure mines aren't proximity exploded by independent players

Closes #2690

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

2272e7fed22104d84e3790ce4c4c08d6e228675c