Merge branch 'master' into public-dashboard

# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js
This commit is contained in:
LouisLam 2021-09-13 01:09:01 +08:00
commit f47f7758f9
33 changed files with 1596 additions and 110 deletions

View file

@ -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,
}
/**