Merge remote-tracking branch 'origin/master' into pedroc/android_e2e_dev
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- CHANGELOG.rst 20 additions, 2 deletionsCHANGELOG.rst
- Makefile 12 additions, 8 deletionsMakefile
- README.rst 6 additions, 2 deletionsREADME.rst
- docs/double_ratchet.svg 0 additions, 0 deletionsdocs/double_ratchet.svg
- docs/megolm.rst 79 additions, 7 deletionsdocs/megolm.rst
- docs/olm.rst 34 additions, 3 deletionsdocs/olm.rst
- docs/signing.rst 118 additions, 0 deletionsdocs/signing.rst
- fuzzers/README.rst 51 additions, 0 deletionsfuzzers/README.rst
- fuzzers/fuzz_group_decrypt.cpp 3 additions, 1 deletionfuzzers/fuzz_group_decrypt.cpp
- include/olm/inbound_group_session.h 2 additions, 1 deletioninclude/olm/inbound_group_session.h
- include/olm/olm.h 4 additions, 2 deletionsinclude/olm/olm.h
- include/olm/outbound_group_session.h 1 addition, 1 deletioninclude/olm/outbound_group_session.h
- javascript/demo/group_demo.js 2 additions, 2 deletionsjavascript/demo/group_demo.js
- javascript/olm_inbound_group_session.js 7 additions, 2 deletionsjavascript/olm_inbound_group_session.js
- javascript/package.json 1 addition, 1 deletionjavascript/package.json
- python/olm/__main__.py 1 addition, 1 deletionpython/olm/__main__.py
- python/olm/_base.py 1 addition, 1 deletionpython/olm/_base.py
- python/olm/account.py 1 addition, 0 deletionspython/olm/account.py
- python/olm/inbound_group_session.py 6 additions, 2 deletionspython/olm/inbound_group_session.py
Loading
Please register or sign in to comment