From: Mario <mario.mario@y7mail.com>
Date: Sun, 20 Dec 2020 11:35:51 +0000 (+0000)
Subject: Merge branch 'Mario/damagetext_reliable' into 'master'
X-Git-Tag: xonotic-v0.8.5~632
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d43def7b137c39cd0997aa32d11796d4f5996f8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/damagetext_reliable' into 'master'

Merge branch Mario/damagetext_reliable (S merge request)

Closes #2405

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

0d43def7b137c39cd0997aa32d11796d4f5996f8