matrix-react-sdk

0f806d5b - Merge branch 'develop' into matthew/canonical_aliases