]> 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: c164c44 b941e31)
Merge branch 'master' into z411/notif-fix
authorMario <mario.mario@y7mail.com>
Mon, 23 Nov 2020 11:52:56 +0000 (21:52 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 23 Nov 2020 11:52:56 +0000 (21:52 +1000)

Trivial merge