]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/drjaska/chat-format' into morosophos/server...
authorNick S <nick@teichisma.info>
Thu, 11 May 2023 12:14:39 +0000 (15:14 +0300)
committerNick S <nick@teichisma.info>
Thu, 11 May 2023 12:14:39 +0000 (15:14 +0300)
1  2 
qcsrc/server/main.qc
xonotic-server.cfg

Simple merge
Simple merge