ariskotsomitopoulos a0e6dd5f6c Merge branch 'develop' into feature/aris/thread_labs_notice_users ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
#	vector/src/main/java/im/vector/app/core/di/SingletonModule.kt

2022-03-18 11:28:21 +01:00

..

src

Merge branch 'develop' into feature/aris/thread_labs_notice_users

2022-03-18 11:28:21 +01:00

.gitignore

…

build.gradle

Use MatrixConfiguration & move presence sync enabled checks out of view

2022-03-17 14:50:15 +01:00

proguard-rules.pro

Remove dependency to org.greenrobot.eventbus library

2021-01-05 18:56:24 +01:00