leaks

Commit

5 years ago

Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks Conflicts: src/components/views/avatars/BaseAvatar.js

References

#4101 - Transition BaseAvatar to hooks

Author

t3chguy

Parents

80c2aa51

562c5aa9

matrix-react-sdk 5844bee8 - Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks

matrix-react-sdk
5844bee8 - Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks