Merge branch '1.14.X'

# Conflicts:
#	package.json
#	server/server.js
This commit is contained in:
Louis Lam 2022-04-19 16:43:13 +08:00
commit 29d2d95c71
9 changed files with 112 additions and 83 deletions

View file

@ -3,7 +3,8 @@
*/
const { TimeLogger } = require("../src/util");
const { R } = require("redbean-node");
const { io } = require("./server");
const { UptimeKumaServer } = require("./uptime-kuma-server");
const io = UptimeKumaServer.getInstance().io;
const { setting } = require("./util-server");
const checkVersion = require("./check-version");