diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2020-09-01 15:57:20 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2020-09-01 15:57:20 -0400 |
| commit | c45f19f12d3da498075970586a37aed7aaafda5a (patch) | |
| tree | 27302fc28d6b89a12fb97f861c949f52ec5dd171 /android/olm-sdk/src/main/AndroidManifest.xml | |
| parent | 171044f3fca084bd1c5c1f8f4bfe146434b07f0b (diff) | |
| parent | 89050dc0b68f0d5f1bf9f9f386f7c2f4ac043f4f (diff) | |
Merge branch 'master' into uhoreg/fallback
Diffstat (limited to 'android/olm-sdk/src/main/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions