aboutsummaryrefslogtreecommitdiff
path: root/android/.DS_Store
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-09 15:37:56 +0000
committerHubert Chathi <hubert@uhoreg.ca>2019-10-09 15:37:56 +0000
commit387deeea8f66c93d84083790fd7b90bee0007ef9 (patch)
treec5dc092e5bb83b5a17863992396f0b82158c1e43 /android/.DS_Store
parent3568060570bb06eff022f49ab39cf34e387e382f (diff)
parentfc423fad15ee3daaf236f211d67a25d03f63b560 (diff)
Merge branch 'dbkr/olm_session_describe' into 'master'
Add olm_session_describe See merge request matrix-org/olm!9
Diffstat (limited to 'android/.DS_Store')
0 files changed, 0 insertions, 0 deletions