Michael Telatynski 493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 ... Conflicts: res/css/views/dialogs/_AddExistingToSpaceDialog.scss src/utils/space.tsx		2021-07-29 15:22:52 +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	…
context_menus	Improve subspaces and some utilities around room/space creation	2021-07-23 08:46:20 +01:00
dialogs	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071	2021-07-29 15:22:52 +01:00
directory	…
elements	Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163	2021-07-27 11:04:23 -06:00
emojipicker	…
groups	…
messages	Merge branch 'develop' into gsouquet/fix-18132	2021-07-29 10:27:00 +02:00
right_panel	…
room_settings	…
rooms	Merge pull request #6499 from matrix-org/gsouquet/fix-18195	2021-07-29 14:33:34 +01:00
settings	Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163	2021-07-27 11:04:23 -06:00
spaces	…
terms	…
toasts	…
verification	…
voip	Fix issues with the controls disappearing	2021-07-25 18:11:29 +02:00