diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-22 04:30:45 +0000 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-22 04:30:45 +0000 |
| commit | 57b6839c2574c9bcfd0ba2e1bef4996e07fc8045 (patch) | |
| tree | 019dbaa5c69350e0ca18d32de737183df3294ae8 /android/olm-sdk/src/main/jni/olm_manager.cpp | |
| parent | e267825bb73517f3dd7c99880ff2fab96264552a (diff) | |
| parent | 32f3a82bf9b9132c0eec70c5abaaac78cf53f6c6 (diff) | |
Merge branch 'rav/megolm_doc_format' into 'master'
Update megolm.md
See merge request matrix-org/olm!6
Diffstat (limited to 'android/olm-sdk/src/main/jni/olm_manager.cpp')
0 files changed, 0 insertions, 0 deletions