SchildiChat-android/matrix-sdk-android/src/main
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
..
assets Try to communicate with WidgetPostAPI 2020-05-13 20:04:08 +02:00
java/org Merge branch 'develop' into feature/aris/prevent_decryption_fom_suspend_functions 2022-04-27 12:26:16 +03:00
res Import sas strings 2021-06-18 10:25:37 +02:00
AndroidManifest.xml Fix warning 2021-09-02 09:43:39 +02:00