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

2021-07-20 08:55:53 -06:00
parent 44e240e12d 4a877300da
commit 5994111e5d
325 changed files with 5224 additions and 4075 deletions
@@ -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 */