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
..
androidTest	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-03 13:56:59 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
main	Merge branch 'develop' into feature/aris/thread_live_thread_list	2022-03-03 13:56:59 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Big annoying commit: execute command ./gradlew ktlintFormat - Fix "colon-spacing"	2021-10-01 13:31:15 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk	using correct license for matrix-sdk test	2021-10-27 16:42:35 +01:00