Merge remote-tracking branch 'origin/develop' into element

This commit is contained in:
J. Ryan Stinnett
2020-07-14 16:57:00 +01:00
4 changed files with 1 additions and 157 deletions

View File

@@ -39,9 +39,6 @@ declare global {
mx_RoomListStore2: RoomListStore2;
mx_RoomListLayoutStore: RoomListLayoutStore;
mxPlatformPeg: PlatformPeg;
// TODO: Remove flag before launch: https://github.com/vector-im/riot-web/issues/14231
mx_QuietRoomListLogging: boolean;
}
// workaround for https://github.com/microsoft/TypeScript/issues/30933