SchildiChat-android/matrix-sdk-android/src/androidTest
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 Merge branch 'develop' into feature/aris/thread_live_thread_list 2022-03-03 13:56:59 +02:00
AndroidManifest.xml Handle change from WorkManager 2.6.0. 2021-09-30 12:06:57 +02:00