Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/notifications/14880

Conflicts: src/@types/global.d.ts
2020-08-05 11:11:14 +01:00
parent c1e152dba2 3675128061
commit 764b94c7ae
3 changed files with 100 additions and 84 deletions
@@ -26,6 +26,7 @@ import RoomListLayoutStore from "../stores/room-list/RoomListLayoutStore";
 import {IntegrationManagers} from "../integrations/IntegrationManagers";
 import {ModalManager} from "../Modal";
 import SettingsStore from "../settings/SettingsStore";
+import {ActiveRoomObserver} from "../ActiveRoomObserver";
 import {Notifier} from "../Notifier";

 declare global {
@@ -42,6 +43,7 @@ declare global {
        mxRebrandListener: RebrandListener;
        mxRoomListStore: RoomListStoreClass;
        mxRoomListLayoutStore: RoomListLayoutStore;
+        mxActiveRoomObserver: ActiveRoomObserver;
        mxPlatformPeg: PlatformPeg;
        mxIntegrationManagers: typeof IntegrationManagers;
        singletonModalManager: ModalManager;