Michael Telatynski afac330143 Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3 ...

 Conflicts:

	src/components/structures/ContextMenu.tsx

	src/components/structures/UserMenu.tsx

	src/components/views/rooms/RoomSublist2.tsx

	src/components/views/rooms/RoomTile2.tsx

2020-07-07 15:01:27 +01:00

..

common.ts

Convert ContextMenu to TypeScript

2020-07-01 23:51:12 +01:00

global.d.ts

Transition languageHandler to Typescript

2020-07-02 23:15:08 +01:00