aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2018-10-05 10:50:01 -0400
committerGitHub <noreply@github.com>2018-10-05 10:50:01 -0400
commit0a25ec137f144d8a9f9a35967bf8999a510910a2 (patch)
tree6f93203a60ee9ec152d7bcd03ef48320f28d0847 /android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
parent602c00a8d658e8510e37e841dd06c70f276d0f00 (diff)
parent173339ae9accddd184bc83f2c23c5ffae3b08d00 (diff)
Merge branch 'master' into dbkr/wasm
Diffstat (limited to 'android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java')
0 files changed, 0 insertions, 0 deletions