Merge branch 'master' into 1.23.X-merge-to-2.X.X-2

# Conflicts:
#	package.json
This commit is contained in:
Louis Lam
2023-12-02 18:43:06 +08:00
25 changed files with 803 additions and 74 deletions

View File

@@ -97,6 +97,7 @@
"express-static-gzip": "~2.1.7",
"form-data": "~4.0.0",
"gamedig": "^4.2.0",
"http-cookie-agent": "~5.0.4",
"html-escaper": "^3.0.3",
"http-graceful-shutdown": "~3.1.7",
"http-proxy-agent": "~5.0.0",
@@ -141,6 +142,7 @@
"tar": "~6.1.11",
"tcp-ping": "~0.1.1",
"thirty-two": "~1.0.2",
"tough-cookie": "~4.1.3",
"ws": "^8.13.0"
},
"devDependencies": {