userinfo

Commit

6 years ago

Merge branch 't3chguy/nvl/userinfo' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/userinfo Conflicts: src/components/views/right_panel/UserInfo.js

References

#3465 - UserInfo consolidation of GroupMemberInfo and MemberInfo panels

Author

t3chguy

Parents

0e6359ab

7e4d429f

matrix-react-sdk 02f8b183 - Merge branch 't3chguy/nvl/userinfo' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/userinfo

matrix-react-sdk
02f8b183 - Merge branch 't3chguy/nvl/userinfo' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/userinfo