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

@@ -361,6 +361,7 @@ export default {
smtpDkimHashAlgo: "Hash Algorithm (Optional)",
smtpDkimheaderFieldNames: "Header Keys to sign (Optional)",
smtpDkimskipFields: "Header Keys not to sign (Optional)",
gorush: "Gorush",
alerta: 'Alerta',
alertaApiEndpoint: 'API Endpoint',
alertaEnvironment: 'Environment',