ericdecanini e6e05317e1 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis ... # Conflicts: # matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt # vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt # vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt		2022-05-31 14:21:16 +02:00
..
assets	Try to communicate with WidgetPostAPI	2020-05-13 20:04:08 +02:00
java/org	Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis	2022-05-31 14:21:16 +02: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