SchildiChat-android/matrix-sdk-android
ariskotsomitopoulos 79a231f1dc Merge branch 'develop' into feature/aris/thread_live_thread_list
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-02-22 12:52:55 +02:00
..
2018-10-03 17:58:12 +02:00