fix-join-part-collapsing-causality

Commit

9 years ago

Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality Conflicts: src/components/views/elements/MemberEventListSummary.js

Author

Luke Barnard

Parents

77ae0414

41d2697e

matrix-react-sdk d690677b - Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality

matrix-react-sdk
d690677b - Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality