16628

Commit

4 years ago

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 Conflicts: src/components/views/dialogs/AddExistingToSpaceDialog.tsx

References

#5923 - Space creation prompt user to add existing rooms for "Just Me" spaces

Author

t3chguy

Parents

8656212e

45541247

matrix-react-sdk 9f8955fb - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628

matrix-react-sdk
9f8955fb - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628