matrix-react-sdk
acde1f3d - Merge branch 'develop' into luke/rts-welcome-pages

Commit

8 years ago

Merge branch 'develop' into luke/rts-welcome-pages Conflicts: src/components/views/avatars/BaseAvatar.js

Author

Luke Barnard

Parents