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
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
src	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-02-22 12:52:55 +02:00
.gitignore
build.gradle	Bump libphonenumber from 8.12.42 to 8.12.43	2022-02-09 23:11:56 +00:00
lint.xml	Revert "AGP 7.1.0"	2022-02-04 12:20:20 +02:00
proguard-rules.pro