Files
element-web/src/components/views/settings
Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
..
2021-04-27 17:23:27 +02:00
2020-12-22 09:29:35 +01:00
2021-04-26 15:21:49 +01:00