Michael Telatynski 598c982f02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187 ...

 Conflicts:

	src/settings/Settings.ts

	src/settings/UIFeature.ts

2020-09-18 11:14:36 +01:00

..

structures

Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup

2020-09-18 10:28:33 +01:00

views

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187

2020-09-18 11:14:36 +01:00