Merge remote-tracking branch 'origin/webview-permission-origin' into desktop-call-origin
# Conflicts: # config.json
This commit is contained in:
+12
-1
@@ -25,5 +25,16 @@
|
||||
},
|
||||
"gifApiKey": "",
|
||||
"webAppUrl": "https://chat.lotusguild.org",
|
||||
"desktopCallOrigin": "http://127.0.0.1:44548"
|
||||
"desktopCallOrigin": "http://127.0.0.1:44548",
|
||||
"statusPages": {
|
||||
"matrix.lotusguild.org": {
|
||||
"url": "https://isitup.lotusguild.org",
|
||||
"slug": "matrix",
|
||||
"groups": {
|
||||
"homeserver": "Homeserver",
|
||||
"calls": "Voice calls",
|
||||
"login": "Login"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user