Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/repo-merge

# Conflicts: # package.json
2024-10-15 15:38:52 +01:00
parent f0ee7f7905 fd62350ce9
commit 643d13066c
7 changed files with 63 additions and 31 deletions
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -64,6 +64,7 @@ type ElectronChannel =
    | "userDownloadAction"
    | "openDesktopCapturerSourcePicker"
    | "userAccessToken"
+    | "homeserverUrl"
    | "serverSupportedVersions";

 declare global {