]> 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: 553d006 aa667e7)
Merge branch 'morosophos/do-not-crash-on-crylink-spike-bug' into morosophos/server...
authorNick S <nick@teichisma.info>
Thu, 27 Jan 2022 15:49:46 +0000 (17:49 +0200)
committerNick S <nick@teichisma.info>
Thu, 27 Jan 2022 15:49:46 +0000 (17:49 +0200)

Trivial merge