]> 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: e1e6725 fd87d34)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Tue, 7 Feb 2023 16:39:36 +0000 (18:39 +0200)
committerNick S <nick@teichisma.info>
Tue, 7 Feb 2023 16:39:36 +0000 (18:39 +0200)

Trivial merge