matrix-react-sdk
ae44a6d1 - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180

Commit
5 years ago
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180  Conflicts:  src/settings/Settings.ts  src/settings/UIFeature.ts
Author
Loading