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

Trivial merge