Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/room_settings/AliasSettings.tsx		2021-06-22 22:02:09 +01:00
..
auth	…
avatars	…
beta	Iterate PR	2021-06-17 16:22:40 +01:00
context_menus	…
dialogs	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244	2021-06-15 12:24:26 +01:00
directory	…
elements	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
emojipicker	…
groups	…
messages	Use the same styling as for mx_TextualEvent	2021-06-10 15:31:27 +02:00
right_panel	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
room_settings	…
rooms	Fix display name overlap	2021-06-15 06:30:22 +02:00
settings	…
spaces	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244	2021-06-22 22:02:09 +01:00
terms	…
toasts	…
verification	…
voice_messages	…
voip	…