SchildiChat-android/matrix-sdk-android
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
..
src Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-03 13:56:59 +02:00
.gitignore
build.gradle Cleanup enabling threads from buildConfig 2022-02-28 17:39:40 +02:00
proguard-rules.pro