Michael Telatynski 9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 ... Conflicts: src/components/views/dialogs/AddExistingToSpaceDialog.tsx		2021-04-28 22:49:36 +01:00
..
auth	…
avatars	…
context_menus	…
dialogs	Space creation prompt user to add existing rooms instead of creating new ones	2021-04-26 12:41:04 +01:00
directory	…
elements	Initial code for dynamic minZoom	2021-04-24 08:03:39 +02:00
emojipicker	…
groups	…
messages	Update action bar to incorporate sending states	2021-04-21 16:24:17 -06:00
right_panel	…
room_settings	…
rooms	Move playback to its own set of classes	2021-04-27 22:23:57 -06:00
settings	…
spaces	…
terms	…
toasts	…
verification	…
voice_messages	Change symbol names	2021-04-28 09:29:31 -06:00
voip	Set box-shadow opacity to 20%	2021-04-27 15:27:11 +02:00