Merge branch 'Mario/spike_removal' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 10 Sep 2019 13:31:46 +0000 (13:31 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 10 Sep 2019 13:31:46 +0000 (13:31 +0000)
commit791468fd65145353c9e9b83e08fe432bfad15c6b
tree77c8047c00fc64e69a9da6110f18342afd1b8e99
parent2f17814bdb8e8e000ae02998665ed9efc0d7f5e8
parentd4831635f720b2ee2a210c544cd7709d32cc6b92
Merge branch 'Mario/spike_removal' into 'master'

Merge branch Mario/spike_removal (XS merge request)

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