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

 Conflicts:

	src/stores/SpaceStore.tsx

2021-07-22 12:44:27 +01:00

..

room

Add way to manage Restricted join rule in Room Settings

2021-07-02 14:51:55 +01:00

user

Improve new layout switcher UI

2021-07-21 14:55:30 +02:00

_SettingsTab.scss

Add way to manage Restricted join rule in Room Settings

2021-07-02 14:51:55 +01:00