Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: res/css/structures/_SpaceRoomView.scss src/components/structures/SpaceRoomView.tsx		2021-04-29 09:52:21 +01:00
..
auth	Fix term_policy aligned to the center	2021-02-03 00:05:55 +05:30
avatars	Tidy up TemporaryTile now that it isn't temporary	2021-03-09 11:19:41 +00:00
beta	Iterate styling and decoration for the beta prompts	2021-04-28 22:47:08 +01:00
context_menus	Fix styling of disabled options in an Iconized menu	2021-03-01 15:40:46 +00:00
dialogs	Space creation prompt user to add existing rooms instead of creating new ones	2021-04-26 12:41:04 +01:00
directory	Use thinner chevron for network, adjust placement	2020-07-31 18:15:51 +01:00
elements	Initial code for dynamic minZoom	2021-04-24 08:03:39 +02:00
emojipicker	…
groups	…
messages	Update action bar to incorporate sending states	2021-04-21 16:24:17 -06:00
right_panel	fix mx_EncryptionInfo_spinner padding in dialogs	2021-03-08 04:41:51 +00:00
room_settings	Remove some unused components	2020-08-20 20:47:02 -06:00
rooms	Move playback to its own set of classes	2021-04-27 22:23:57 -06:00
settings	Show Spaces beta card in Labs & My Communities view	2021-04-27 16:29:42 +01:00
spaces	Add beta pill to space create menu	2021-04-28 12:10:03 +01:00
terms	…
toasts	Add missing scss file	2020-11-09 14:36:12 +00:00
verification	…
voice_messages	Change symbol names	2021-04-28 09:29:31 -06:00
voip	Set box-shadow opacity to 20%	2021-04-27 15:27:11 +02:00