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
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
signature
src	Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis	2022-05-31 14:21:16 +02:00
.gitignore
build.gradle	Merge pull request #5780 from ofalvai/dependency-cleanup	2022-05-30 15:41:10 +02:00
lint.xml	Small improvement on lint.xml file	2022-05-16 12:23:10 +02:00
proguard-rules.pro