Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 ... Conflicts: src/components/structures/ScrollPanel.js src/components/views/rooms/AppsDrawer.js		2020-09-07 14:33:57 +01:00
..
auth	…
avatars	…
context_menus	…
dialogs	…
directory	…
elements	…
emojipicker	…
groups	…
messages	…
right_panel	…
room_settings	…
rooms	…
settings	…
terms	…
toasts	…
verification	…
voip	…