diff options
| author | David Baker <dave@matrix.org> | 2018-10-10 20:08:55 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2018-10-10 20:08:55 +0100 |
| commit | 82534708a35640672c812e7603a84a9f42c8b50c (patch) | |
| tree | f8e9a909d9bc075fb40b968fa4c478f42ebf9668 /android/olm-sdk/src/androidTest/java/org/matrix/olm | |
| parent | 2cbba061c3f0ce4d7f86c3dc2b7f7fd5f4f45ff7 (diff) | |
| parent | 3cfcf1615dfe434e1aa10d5c904d537b159e1566 (diff) | |
Merge remote-tracking branch 'origin/master' into dbkr/ci2
Diffstat (limited to 'android/olm-sdk/src/androidTest/java/org/matrix/olm')
0 files changed, 0 insertions, 0 deletions