]> 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: 9a775e7 ea4a13b)
Merge remote-tracking branch 'origin/Juhu/link_after_solid' into morosophos/server...
authorNick S <nick@teichisma.info>
Thu, 11 May 2023 20:55:30 +0000 (23:55 +0300)
committerNick S <nick@teichisma.info>
Thu, 11 May 2023 20:55:30 +0000 (23:55 +0300)

Trivial merge