]> 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: f477229 f084f1c)
Merge branch 'z411/bai-server' into LegendaryGuard/bai_mod
authorLegendaryGuard <rootuser999@gmail.com>
Mon, 19 Apr 2021 21:40:06 +0000 (23:40 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Mon, 19 Apr 2021 21:40:06 +0000 (23:40 +0200)

Trivial merge