Michael Telatynski c904b4f416 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 ...

 Conflicts:

	src/settings/Settings.ts

	src/settings/UIFeature.ts

2020-09-17 14:10:51 +01:00

..

room

UI Feature Flag: Hide flair

2020-09-16 11:26:15 +01:00

user

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

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