Michael Telatynski ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 ... Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts		2020-09-17 13:42:27 +01:00
..
auth	…
avatars	…
context_menus	…
dialogs	…
directory	…
elements	…
emojipicker	…
groups	…
messages	Fix corner rounding on images not always affecting right side	2020-08-17 10:55:54 +01:00
right_panel	…
room_settings	…
rooms	…
settings	…
terms	…
toasts	…
verification	…
voip	…