Merge branch 'develop' into t3chguy/ts/11
This commit is contained in:
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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue