Michael Telatynski
|
2a8e8b93aa
|
add comment
|
2021-09-10 09:48:46 +01:00 |
|
Michael Telatynski
|
630835961b
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
Conflicts:
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
|
2021-09-09 11:01:11 +01:00 |
|
Michael Telatynski
|
2eb64de508
|
Tweak edge case behaviour
|
2021-09-09 10:54:31 +01:00 |
|
Michael Telatynski
|
979bc71609
|
Deduplicate join rule management between rooms and spaces
|
2021-09-01 15:52:56 +01:00 |
|