]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into morosophos/server-current4
authorNick S <nick@teichisma.info>
Fri, 20 Jan 2023 22:36:00 +0000 (00:36 +0200)
committerNick S <nick@teichisma.info>
Fri, 20 Jan 2023 22:36:00 +0000 (00:36 +0200)
commit345a846bb7451f5bcbc94206c08463227e0f9d27
treeee9f5135a7fed3e2ae70a1ad52b7ac631963db3f
parent241a6259d1971899966e02bb9680644cea92e3ec
parentfcb0f6d236fa380f14f3ef26bf1aa2c997093810
Merge remote-tracking branch 'origin/master' into morosophos/server-current4