Merge branch 'Spike29/entities' into 'master' master
authorMirio <opivy@hotmail.de>
Sun, 19 Apr 2020 12:26:52 +0000 (12:26 +0000)
committerMirio <opivy@hotmail.de>
Sun, 19 Apr 2020 12:26:52 +0000 (12:26 +0000)
commit30914295ece9b8343f4b2c365144131241b0da7b
treed7fbdffad579feb4c2a2c8dfb99c37fe8d378bce
parentb0615889472ac61d650c1c7d38073749a7725c0b
parentff280c29a4b28c522899a4d9f204c9dfd4c70600
Merge branch 'Spike29/entities' into 'master'

trigger_hurt: fix the INVERT_TEAM description

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