ariskotsomitopoulos 51b42929bd Merge branch 'develop' into feature/aris/prevent_decryption_fom_suspend_functions ...

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt

2022-04-27 12:26:16 +03:00

..

src

Merge branch 'develop' into feature/aris/prevent_decryption_fom_suspend_functions

2022-04-27 12:26:16 +03:00

.gitignore

first commit

2018-10-03 17:58:12 +02:00

build.gradle

Version hotfix 1.4.13

2022-04-26 11:29:40 +02:00

proguard-rules.pro

Remove dependency to org.greenrobot.eventbus library

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