Merge branch 'master' into public-dashboard

# Conflicts:
#	server/server.js
This commit is contained in:
LouisLam 2021-09-20 18:48:44 +08:00
commit a8e170f6a8
23 changed files with 430 additions and 30 deletions

View file

@ -128,6 +128,7 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
exports.entryPage = "dashboard";
(async () => {
Database.init(args);
await initDatabase();
exports.entryPage = await setting("entryPage");