Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink

2020-12-07 10:30:50 +13:00
parent 5544ee6408 c13891c670
commit b365d3b27e
98 changed files with 3150 additions and 1812 deletions
@@ -140,6 +140,6 @@ export async function leaveRoomBehaviour(roomId: string) {
    }

    if (RoomViewStore.getRoomId() === roomId) {
-        dis.dispatch({action: 'view_next_room'});
+        dis.dispatch({action: 'view_home_page'});
    }
 }