imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download

Browse source
This commit is contained in:
Travis Ralston 2021-07-20 08:55:53 -06:00
commit 5994111e5d
325 changed files with 5224 additions and 4075 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/@types/global.d.ts vendored
View file

@ -50,6 +50,8 @@ import UIStore from "../stores/UIStore";
import { SetupEncryptionStore } from "../stores/SetupEncryptionStore";
import { RoomScrollStateStore } from "../stores/RoomScrollStateStore";
/* eslint-disable @typescript-eslint/naming-convention */
declare global {
interface Window {
matrixChat: ReturnType<Renderer>;
@ -186,3 +188,5 @@ declare global {
}
);
}
/* eslint-enable @typescript-eslint/naming-convention */