mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-26 10:58:34 +03:00
e323caa233
# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt |
||
---|---|---|
.. | ||
java/org/matrix/android/sdk | ||
AndroidManifest.xml |