Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash ... Conflicts: src/ContentMessages.tsx src/components/structures/UploadBar.tsx src/components/views/messages/MImageBody.js src/components/views/messages/MStickerBody.js src/components/views/messages/MVideoBody.tsx		2021-07-01 20:48:34 +01:00
..
audio_messages	lint	2021-06-30 14:51:18 -06:00
auth
avatars
beta	Iterate PR	2021-06-17 16:22:40 +01:00
context_menus	update message context texts and icons	2021-06-24 22:20:53 +02:00
dialogs	Fix tiny scrollbar dot on chrome/electron in Forward Dialog	2021-06-28 15:37:28 +01:00
directory
elements	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
emojipicker
groups
messages	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash	2021-07-01 20:48:34 +01:00
right_panel	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
room_settings
rooms	Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648	2021-06-28 16:10:02 +01:00
settings
spaces	Fix space avatar management layout being broken	2021-06-25 11:10:37 +01:00
terms
toasts
verification
voip	Merge pull request #5786 from DantrazTrev/DialPad	2021-06-23 11:41:41 +01:00