aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/androidTest/java/org/matrix/olm
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-04-28 11:35:58 +0000
committerHubert Chathi <hubert@uhoreg.ca>2019-04-28 11:35:58 +0000
commit327d6ac0eb788429dcbb0b012037ea30020a14fe (patch)
treef5021b580aad53bde9d236a099b8edcf14268773 /android/olm-sdk/src/androidTest/java/org/matrix/olm
parent992323c37cfa997939938281cb08f84ec8968a5b (diff)
parent6eca9f1278e9874c9c6bb31555d164c376d264ed (diff)
Merge branch 'poljar/cmake_sas' into 'master'
cmake: Add the SAS functions to the CMake build. See merge request matrix-org/olm!1
Diffstat (limited to 'android/olm-sdk/src/androidTest/java/org/matrix/olm')
0 files changed, 0 insertions, 0 deletions