Merge branch '1.23.X'

# Conflicts:
#	package-lock.json
#	server/database.js
#	server/server.js
#	server/util-server.js
This commit is contained in:
Louis Lam
2023-10-09 21:28:01 +08:00
12 changed files with 100 additions and 33 deletions

View File

@@ -881,6 +881,7 @@ const monitorDefaults = {
kafkaProducerSaslOptions: {
mechanism: "None",
},
kafkaProducerSsl: false,
gamedigGivenPortOnly: true,
};