Michael Telatynski 4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets ... Conflicts: src/components/views/elements/AppTile.js		2020-10-21 12:48:51 +01:00
..
auth	…
avatars	…
context_menus	…
dialogs	…
directory	…
elements	…
emojipicker	…
groups	…
messages	…
right_panel	…
room_settings	…
rooms	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets	2020-10-21 12:48:51 +01:00
settings	…
terms	…
toasts	…
verification	…
voip	…