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/main

Merge branch 'develop' into feature/aris/thread_live_thread_list

2022-03-03 13:56:59 +02:00

.gitignore

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

build.gradle

No need to add explicit dependencies on stdlib, this is added by the gradle plugin since 1.4

2021-10-19 19:06:27 +02:00

consumer-rules.pro

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

proguard-rules.pro

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