aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/jni/olm_account.h
diff options
context:
space:
mode:
authormanuroe <manu@matrix.org>2016-11-07 17:21:39 +0100
committermanuroe <manu@matrix.org>2016-11-07 17:21:39 +0100
commit5d1b66c350ac017613982f904b896750766654de (patch)
treea290c557e7881f7eb48cbdd568a4f3e43cb749c6 /android/olm-sdk/src/main/jni/olm_account.h
parent62f52806702b799b9e25e7cdf07be1c8a31325a2 (diff)
parentf6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff)
Merge remote-tracking branch 'origin/master' into olmkit
Diffstat (limited to 'android/olm-sdk/src/main/jni/olm_account.h')
0 files changed, 0 insertions, 0 deletions