SchildiChat-android/matrix-sdk-android
ericdecanini 8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
2022-05-25 17:35:31 +02:00
..
2018-10-03 17:58:12 +02:00
2022-05-17 21:28:11 +02:00