]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server...
authorNick S <nick@teichisma.info>
Wed, 25 Jan 2023 20:39:17 +0000 (22:39 +0200)
committerNick S <nick@teichisma.info>
Wed, 25 Jan 2023 20:39:17 +0000 (22:39 +0200)
commit71d562b6f1232b8b28c33314499a8e77e88275fc
tree9d5618e5347cc7485fc3a5ce95091cd59397c3a5
parent31b301b6c00d273817ccdd67a230415676a9d2b5
parent9fe51ea9d221318bdd640763ac16ffaecdbc7742
Merge remote-tracking branch 'origin/Juhu/strafehud-server' into morosophos/server-current4