Merge branch 'master' into Spiritreader_master

# Conflicts:
#	src/pages/EditMonitor.vue
This commit is contained in:
LouisLam 2021-07-22 17:34:41 +08:00
commit 86e18ac11d
20 changed files with 363 additions and 80 deletions

View file

@ -124,7 +124,7 @@ export default {
name: "",
url: "https://",
interval: 60,
maxretries: 0,
maxretries: 0,
notificationIDList: {},
}
} else if (this.isEdit) {