matrix-js-sdk
331c9ce1 - [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps

Comment changes are shownComment changes are hidden
Commit
5 years ago
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps
Author
  • src/crypto
    • File
      index.js
    • verification
      • File
        SAS.js