]> 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: 746de98 c42cc19)
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNikolay S <nick@teichisma.info>
Tue, 14 Jan 2025 12:01:57 +0000 (13:01 +0100)
committerNikolay S <nick@teichisma.info>
Tue, 14 Jan 2025 12:01:57 +0000 (13:01 +0100)

Trivial merge