]> 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: 30c45e1 c0284b2)
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Thu, 25 Nov 2021 19:43:35 +0000 (16:43 -0300)
committerz411 <z411@omaera.org>
Thu, 25 Nov 2021 19:43:35 +0000 (16:43 -0300)

Trivial merge