Michael Telatynski 1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 ... Conflicts: src/components/structures/SpaceRoomView.tsx src/components/views/dialogs/BetaFeedbackDialog.tsx		2021-07-23 18:28:21 +01:00
..
audio_messages	Force padding overrides to take precedence over MediaBody styles	2021-07-21 14:47:27 -06:00
auth	…
avatars	Fix clipped avatar in room list	2021-07-23 14:17:26 +02:00
beta	Move RightPanel animation to compositor	2021-07-02 15:23:03 +01:00
context_menus	update message context texts and icons	2021-06-24 22:20:53 +02:00
dialogs	Change spaces beta feedback to not be so beta-centric	2021-07-23 15:47:11 +01:00
directory	…
elements	Merge pull request #6212 from matrix-org/t3chguy/fix/17686	2021-07-23 09:09:17 +01:00
emojipicker	…
groups	…
messages	Use div instead of span for mx_MImageBody to not violate spec	2021-07-23 16:22:35 +01:00
right_panel	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
room_settings	…
rooms	Fix clipped avatar in room list	2021-07-23 14:17:26 +02:00
settings	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686	2021-07-22 12:44:27 +01:00
spaces	remove unused import and revert removing some needed css	2021-07-23 15:56:00 +01:00
terms	…
toasts	…
verification	…
voip	Add dialpad to transfer dialog + various dialpad UI improvements (#6363)	2021-07-15 09:55:58 +01:00