Merge branch 'master' into alerta

# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
This commit is contained in:
Louis Lam
2022-03-04 14:10:37 +08:00
5 changed files with 98 additions and 0 deletions

View File

@@ -26,6 +26,7 @@ import SerwerSMS from "./SerwerSMS.vue";
import Stackfield from './Stackfield.vue';
import WeCom from "./WeCom.vue";
import GoogleChat from "./GoogleChat.vue";
import Gorush from "./Gorush.vue";
import Alerta from "./Alerta.vue";
/**
@@ -62,6 +63,7 @@ const NotificationFormList = {
"stackfield": Stackfield,
"WeCom": WeCom,
"GoogleChat": GoogleChat,
"gorush": Gorush,
"alerta": Alerta,
};