Šimon Brandner 44258fd278 Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603		2021-08-02 11:32:57 +02:00
..
room	Add way to manage Restricted join rule in Room Settings	2021-07-02 14:51:55 +01:00
user	Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603	2021-08-02 11:32:57 +02:00
_SettingsTab.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093	2021-07-28 19:24:26 +01:00