Merge branch 'master' into public-dashboard

# Conflicts: # server/database.js # server/server.js # server/util-server.js
2025-08-08 19:14:06 +08:00 · 2021-09-13 01:09:01 +08:00
parent 934685637a 7df9698e5d
commit f47f7758f9
33 changed files with 1596 additions and 110 deletions
--- a/server/database.js
+++ b/server/database.js
@@ -31,6 +31,7 @@ class Database {
        "patch-setting-value-type.sql": true,
        "patch-improve-performance.sql": true,
        "patch-monitor-public.sql": true,
+        "patch-2fa.sql": true,
    }

    /**