Merge remote-tracking branch 'origin/develop' into travis/room-list/sticky

This commit is contained in:
Travis Ralston 2020-06-07 13:06:30 -06:00
commit a7fe7cb28d
3 changed files with 46 additions and 16 deletions

View file

@ -38,7 +38,8 @@ export type TagID = string | DefaultTagID;
export enum RoomUpdateCause {
Timeline = "TIMELINE",
RoomRead = "ROOM_READ", // TODO: Use this.
PossibleTagChange = "POSSIBLE_TAG_CHANGE",
ReadReceipt = "READ_RECEIPT",
NewRoom = "NEW_ROOM",
RoomRemoved = "ROOM_REMOVED",
}