matrix-react-sdk

b2c161c7 - Merge branch 'develop' into travis/settings/delete-the-old