18071

Commit

4 years ago

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 Conflicts: res/css/views/dialogs/_AddExistingToSpaceDialog.scss src/utils/space.tsx

References

#6424 - Prompt user to leave rooms/subspaces in a space when leaving space

Author

t3chguy

Parents

62033d02

dac3eda9

matrix-react-sdk 493cd01e - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071

matrix-react-sdk
493cd01e - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071