Merge branch 'Mario/intrusivelist_objects' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 20 Jan 2020 07:06:39 +0000 (07:06 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 20 Jan 2020 07:06:39 +0000 (07:06 +0000)
Merge branch Mario/intrusivelist_objects (S merge request)

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


Trivial merge