From: Mario <mario.mario@y7mail.com>
Date: Fri, 6 Nov 2020 14:41:49 +0000 (+0000)
Subject: Merge branch 'Mario/filter_highping' into 'master'
X-Git-Tag: xonotic-v0.8.5~689
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c57efea24625aae14145ef68e2b42faacfd275e8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/filter_highping' into 'master'

Merge branch Mario/filter_highping (S merge request)

Closes #2388

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

c57efea24625aae14145ef68e2b42faacfd275e8