From: Mirio <opivy@hotmail.de>
Date: Sun, 19 Apr 2020 12:26:52 +0000 (+0000)
Subject: Merge branch 'Spike29/entities' into 'master'
X-Git-Tag: xonotic-v0.8.5~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=30914295ece9b8343f4b2c365144131241b0da7b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Spike29/entities' into 'master'

trigger_hurt: fix the INVERT_TEAM description

See merge request xonotic/xonotic-maps.pk3dir!145
---

30914295ece9b8343f4b2c365144131241b0da7b