matrix-js-sdk
65d64bf2
- Merge remote-tracking branch 'origin/develop' into markjh/end_to_end
Go
Login via GitHub
Home
Pricing
FAQ
Install
Login
via GitHub
Commit
View On
GitHub
Commit
10 years ago
Merge remote-tracking branch 'origin/develop' into markjh/end_to_end Conflicts: lib/client.js lib/matrix.js
References
#17 - Add support for end-to-end using olm
Author
NegativeMjark
Parents
d20bd41f
32c4d3ff
Loading