Merge remote-tracking branch 'origin/master' into doubles-ss_master

# Conflicts:
#	server/database.js
This commit is contained in:
Louis Lam 2023-03-12 18:38:19 +08:00
commit 491239415e
67 changed files with 4238 additions and 404 deletions

View file

@ -72,6 +72,7 @@ class Monitor extends BeanModel {
let data = {
id: this.id,
name: this.name,
description: this.description,
url: this.url,
method: this.method,
hostname: this.hostname,