Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240		2021-06-28 21:00:36 -06:00
..
audio_messages	Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240	2021-06-28 21:00:36 -06:00
auth	Fix term_policy aligned to the center	2021-02-03 00:05:55 +05:30
avatars	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
beta	Iterate PR	2021-06-17 16:22:40 +01:00
context_menus	Add temporary mechanism for managing communities without dnd	2021-06-02 11:33:25 +01:00
dialogs	Fix tiny scrollbar dot on chrome/electron in Forward Dialog	2021-06-28 15:37:28 +01:00
directory
elements	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
emojipicker
groups
messages	Merge remote-tracking branch 'origin/develop' into travis/new-audio	2021-06-28 20:52:44 -06:00
right_panel	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
room_settings
rooms	Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648	2021-06-28 16:10:02 +01: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	Fix space avatar management layout being broken	2021-06-25 11:10:37 +01:00
terms
toasts
verification
voip	Merge pull request #5786 from DantrazTrev/DialPad	2021-06-23 11:41:41 +01:00