]> 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: d2a98d7 78a277f)
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Sat, 27 Nov 2021 03:34:33 +0000 (00:34 -0300)
committerz411 <z411@omaera.org>
Sat, 27 Nov 2021 03:34:33 +0000 (00:34 -0300)

Trivial merge