matrix-js-sdk

1b80c836 - Merge branch 'develop' into travis/update-qr-code