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

# Conflicts:
#	package.json
This commit is contained in:
Michael Telatynski 2024-10-15 15:38:52 +01:00
commit 643d13066c
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
7 changed files with 63 additions and 31 deletions

View file

@ -64,6 +64,7 @@ type ElectronChannel =
| "userDownloadAction"
| "openDesktopCapturerSourcePicker"
| "userAccessToken"
| "homeserverUrl"
| "serverSupportedVersions";
declare global {