Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size

# Conflicts:
#	server/util-server.js
#	src/languages/en.js
This commit is contained in:
Louis Lam
2023-01-25 16:12:33 +08:00
146 changed files with 22276 additions and 17092 deletions

View File

@@ -0,0 +1,5 @@
BEGIN TRANSACTION;
ALTER TABLE monitor
ADD game VARCHAR(255);
COMMIT