ariskotsomitopoulos 6503412928 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt # vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt		2022-01-10 13:26:57 +02:00
..
src	Merge branch 'develop' into feature/aris/threads	2022-01-10 13:26:57 +02:00
.gitignore
build.gradle	Github actions improvement test	2022-01-03 12:14:14 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00