matrix-js-sdk

3effeb7d - Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/ts/4

Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/ts/4
Conflicts:
package.json
src/@types/global.d.ts
src/crypto/key_passphrase.ts
src/crypto/olmlib.ts
src/utils.ts