]> 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: 1a48953 cd6c2c9)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Thu, 27 Apr 2023 19:40:37 +0000 (22:40 +0300)
committerNick S <nick@teichisma.info>
Thu, 27 Apr 2023 19:40:37 +0000 (22:40 +0300)

Trivial merge