Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key

# Conflicts:
#	src/lang/en.json
This commit is contained in:
Louis Lam
2023-02-25 00:06:25 +08:00
59 changed files with 1964 additions and 115 deletions

View File

@@ -71,6 +71,7 @@ class Database {
"patch-api-key-table.sql": true,
"patch-add-gamedig-monitor.sql": true,
"patch-add-google-analytics-status-page-tag.sql": true,
"patch-http-body-encoding.sql": true
};
/**