aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/res
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-09-13 17:55:21 +0100
committerMark Haines <mjark@negativecurvature.net>2016-09-13 17:55:21 +0100
commitf274adfe245397a58a167a2ffc266a880d9a8d89 (patch)
treed43c062fcb92524e4eefa371f8d6073b7234a8bd /android/olm-sdk/src/main/res
parentd7bc00c81d9f98d88e77f55056d6cebab90d8f85 (diff)
parent576c6ad29292e171a88303e069b4a4a9680cb3bd (diff)
Merge remote-tracking branch 'matrix/master'
Diffstat (limited to 'android/olm-sdk/src/main/res')
0 files changed, 0 insertions, 0 deletions