Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: res/css/structures/_SpaceRoomView.scss src/components/structures/SpaceRoomView.tsx		2021-04-29 09:52:21 +01:00
..
auth	…
avatars	…
beta	…
context_menus	…
dialogs	…
directory	…
elements	…
emojipicker	…
groups	…
messages	…
right_panel	…
room_settings	…
rooms	…
settings	…
spaces	…
terms	…
toasts	…
verification	…
voice_messages	…
voip	…