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
..
_common_CryptoEvent.scss	put this just on the buttons	2021-07-01 15:22:44 +01:00
_CreateEvent.scss
_DateSeparator.scss
_EventTileBubble.scss
_MediaBody.scss	Unify audio message types to new media body	2021-06-24 11:38:35 -06:00
_MEmoteBody.scss
_MessageActionBar.scss
_MessageTimestamp.scss
_MFileBody.scss
_MImageBody.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash	2021-07-01 20:48:34 +01:00
_MJitsiWidgetEvent.scss
_MjolnirBody.scss
_MNoticeBody.scss
_MStickerBody.scss
_MTextBody.scss
_MVideoBody.scss
_MVoiceMessageBody.scss
_ReactionsRow.scss
_ReactionsRowButton.scss
_RedactedBody.scss
_RoomAvatarEvent.scss
_SenderProfile.scss
_TextualEvent.scss
_UnknownBody.scss
_ViewSourceEvent.scss