Files
element-web/src/components/views/settings
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
..
2020-05-25 13:40:05 +01:00
2020-07-07 12:16:16 +02:00
2020-08-29 12:14:16 +01:00
2020-08-29 12:14:16 +01:00
2020-08-29 12:14:16 +01:00