Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/repo-merge
# Conflicts: # package.json
This commit is contained in:
commit
643d13066c
7 changed files with 63 additions and 31 deletions
1
src/@types/global.d.ts
vendored
1
src/@types/global.d.ts
vendored
|
@ -64,6 +64,7 @@ type ElectronChannel =
|
|||
| "userDownloadAction"
|
||||
| "openDesktopCapturerSourcePicker"
|
||||
| "userAccessToken"
|
||||
| "homeserverUrl"
|
||||
| "serverSupportedVersions";
|
||||
|
||||
declare global {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue