ariskotsomitopoulos f98b595d85 Merge branch 'develop' into feature/aris/threads_live_timeline ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo025.kt		2022-02-14 16:13:51 +02:00
..
src	Merge branch 'develop' into feature/aris/threads_live_timeline	2022-02-14 16:13:51 +02:00
.gitignore
build.gradle	Bump libphonenumber from 8.12.42 to 8.12.43	2022-02-09 23:11:56 +00:00
proguard-rules.pro