aboutsummaryrefslogtreecommitdiff
path: root/java/android/OlmLibSdk/olm-sdk/src
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-09-23 11:55:28 +0100
committerRichard van der Hoff <richard@matrix.org>2016-09-23 11:55:28 +0100
commit6ea9fb450ec1ef10b32d65ceb00a6042b927a95c (patch)
treeebef09423d96c58d615451f927c33ba004dac308 /java/android/OlmLibSdk/olm-sdk/src
parent97c991ffee7f59dac1615b2f0b187470782ef0a4 (diff)
parent4049261867fc1a4d9e7689635788d538a09aab31 (diff)
Merge branch 'rav/megolm_spec'
Diffstat (limited to 'java/android/OlmLibSdk/olm-sdk/src')
0 files changed, 0 insertions, 0 deletions