aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-26 13:27:23 +0100
committerMark Haines <mjark@negativecurvature.net>2016-05-26 13:27:23 +0100
commit09b8c3d7bc9e62760ed17575159de655e90b399b (patch)
tree88c0554aad2a2adaf540b4a3bbfa88a0171e2602 /android/olm-sdk
parentbfeb554e8699c5cb90cab14dc74e15c30f963d74 (diff)
parent708fddd747789a101123b09b67c064b119db8873 (diff)
Merge remote-tracking branch 'matrix/master'
Diffstat (limited to 'android/olm-sdk')
0 files changed, 0 insertions, 0 deletions