]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dde6b3 50ac0ea)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Thu, 19 Jan 2023 19:42:49 +0000 (21:42 +0200)
committerNick S <nick@teichisma.info>
Thu, 19 Jan 2023 19:42:49 +0000 (21:42 +0200)

Trivial merge