aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/res/values
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2018-10-05 14:54:29 -0400
committerGitHub <noreply@github.com>2018-10-05 14:54:29 -0400
commit2cbba061c3f0ce4d7f86c3dc2b7f7fd5f4f45ff7 (patch)
tree4f4b91087ce8eff6663da117b92db5fd282e2afc /android/olm-sdk/src/main/res/values
parent031eb2dc7591b85937668513d44a08991f4b3d8e (diff)
parent173339ae9accddd184bc83f2c23c5ffae3b08d00 (diff)
Merge branch 'master' into dbkr/ci2
Diffstat (limited to 'android/olm-sdk/src/main/res/values')
0 files changed, 0 insertions, 0 deletions