Merge branch 'develop' into t3chguy/ts/11

2021-07-02 11:03:54 +01:00
parent 88f691776f 0425b02982
commit 82119a08f7
61 changed files with 467 additions and 766 deletions
@@ -204,7 +204,7 @@ interface IState {
    resizeNotifier: ResizeNotifier;
    serverConfig?: ValidatedServerConfig;
    ready: boolean;
-    threepidInvite?: IThreepidInvite,
+    threepidInvite?: IThreepidInvite;
    roomOobData?: object;
    pendingInitialSync?: boolean;
    justRegistered?: boolean;