SchildiChat-android/matrix-sdk-android/src/androidTest
ariskotsomitopoulos e323caa233 Merge branch 'develop' into feature/aris/crypto_replay_attack
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-20 15:46:15 +03:00
..
java/org/matrix/android/sdk Merge branch 'develop' into feature/aris/crypto_replay_attack 2022-05-20 15:46:15 +03:00
AndroidManifest.xml Handle change from WorkManager 2.6.0. 2021-09-30 12:06:57 +02:00