Michael Telatynski df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 ... Conflicts: src/i18n/strings/en_EN.json		2021-05-11 14:07:47 +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	Design iterations based on PR feedback	2021-04-29 16:08:59 +01:00
context_menus	Fix styling of disabled options in an Iconized menu	2021-03-01 15:40:46 +00:00
dialogs	Add disclaimer about subspaces being experimental in add existing dialog	2021-05-05 17:53:31 +01:00
directory	Use thinner chevron for network, adjust placement	2020-07-31 18:15:51 +01:00
elements	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176	2021-05-06 13:06:50 +01:00
emojipicker	…
groups	…
messages	Update visual style of plain files in the timeline	2021-05-04 21:13:37 -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	Fix voice message playback being squished up against send button	2021-05-06 21:41:04 -06:00
settings	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-05-06 08:05:14 +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	Update colours and sizing for voice messages	2021-05-04 20:45:15 -06:00
voip	Merge branch 'develop' into feed	2021-04-28 10:52:23 +02:00