aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/res/values
diff options
context:
space:
mode:
authormanuroe <manu@matrix.org>2016-09-27 08:30:33 +0200
committermanuroe <manu@matrix.org>2016-09-27 08:30:33 +0200
commit1d06f2a4d9565c332081bc685edd8fd61d6507ef (patch)
treece61f13c9347786276238fc36e34dde4d5d32f5a /android/olm-sdk/src/main/res/values
parent8a8d100ee5be5961861e53f8b3b5702e8902af74 (diff)
parentdaab2a58af947cddd67fe9f30dd3a9fc327650c0 (diff)
Merge remote-tracking branch 'OLMKit/olmkit' into olmkit
# Conflicts: # .gitignore # include/olm/olm.hh # javascript/README.md
Diffstat (limited to 'android/olm-sdk/src/main/res/values')
0 files changed, 0 insertions, 0 deletions