]> 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: 8009dfb 8319882)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Wed, 2 Feb 2022 17:27:20 +0000 (19:27 +0200)
committerNick S <nick@teichisma.info>
Wed, 2 Feb 2022 17:27:20 +0000 (19:27 +0200)

Trivial merge