diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2020-05-19 15:08:27 +0000 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2020-05-19 15:08:27 +0000 |
| commit | ad173bc798c039bd4e855a25b99f15193bdb04c4 (patch) | |
| tree | cb2fb8dff3215ffca77a4a320367ab05fd175a1f /android/olm-sdk/src/main/java/org/matrix/olm/OlmPkDecryption.java | |
| parent | 5a9fdd85cb1ad54813df2ecd6eb24ff84e32656a (diff) | |
| parent | ddd140b23d4352f7fb5164c42db3ef5e1714fe36 (diff) | |
Merge branch 'matthew/js-fixes' into 'master'
Fix JS demos, which had bitrotted
See merge request matrix-org/olm!12
Diffstat (limited to 'android/olm-sdk/src/main/java/org/matrix/olm/OlmPkDecryption.java')
0 files changed, 0 insertions, 0 deletions