]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3b025b 82f2f94)
Merge branch 'Mario/filter_highping' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 14:41:49 +0000 (14:41 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 14:41:49 +0000 (14:41 +0000)
Merge branch Mario/filter_highping (S merge request)

Closes #2388

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


Trivial merge