]> 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: 37ee9e7 ba0c45e)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S <nick@teichisma.info>
Wed, 13 Sep 2023 20:11:04 +0000 (23:11 +0300)
committerNikolay S <nick@teichisma.info>
Wed, 13 Sep 2023 20:11:04 +0000 (23:11 +0300)

Trivial merge