]> 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: d17c2dd fd7e1b3)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S <nick@teichisma.info>
Tue, 23 Jul 2024 20:22:26 +0000 (22:22 +0200)
committerNikolay S <nick@teichisma.info>
Tue, 23 Jul 2024 20:22:26 +0000 (22:22 +0200)

Trivial merge