]> 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: 53c0bd9 7ea478d)
Merge branch 'z411/bai-server' into LegendaryGuard/bai_mod
authorLegendaryGuard <rootuser999@gmail.com>
Wed, 5 May 2021 18:05:38 +0000 (20:05 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Wed, 5 May 2021 18:05:38 +0000 (20:05 +0200)

Trivial merge