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

UI Feature Flag: Registration, Password Reset, Deactivate

2020-09-17 11:55:10 +01:00

avatars

…

context_menus

Consolidate all the work thus far

2020-09-08 15:43:38 +01:00

dialogs

UI Feature Flag: Share dialog QR code and social icons

2020-09-16 16:06:17 +01:00

directory

…

elements

Add new create group dialog

2020-08-25 21:08:24 -06:00

emojipicker

…

groups

…

messages

…

right_panel

Merge pull request #5195 from matrix-org/travis/iconography-update

2020-09-11 09:12:46 -06:00

room_settings

…

rooms

Remove defunct "always show encryption icons" setting

2020-09-14 22:03:54 -06:00

settings

Add independent set up / reset actions in Settings

2020-09-08 18:01:56 +01:00

terms

…

toasts

…

verification

…

voip

…