]> de.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: 9a841fa a123654)
Merge branch 'martin-t/blaster' into 'master'
authorMario <mario.mario@y7mail.com>
Wed, 28 Aug 2019 17:15:48 +0000 (17:15 +0000)
committerMario <mario.mario@y7mail.com>
Wed, 28 Aug 2019 17:15:48 +0000 (17:15 +0000)
Restore blaster push

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


Trivial merge