ariskotsomitopoulos e4282e5f29 Merge branch 'develop' into feature/aris/thread_live_thread_list ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt		2022-03-03 13:56:59 +02:00
..
java/org/matrix/android/sdk/flow	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-03 13:56:59 +02:00
AndroidManifest.xml	Revert "Mavericks 2: remove matrix-sdk-android-flow as it will be easier when entirely migrating to flow"	2021-10-07 11:11:44 +02:00