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
..
src/main	Changes code style method parameters new line around parentheses to true	2022-05-23 12:30:42 +02:00
.gitignore	moves attachment-viewer module to library	2022-02-22 19:44:30 +01:00
build.gradle	Cleanup	2022-04-17 11:09:10 +02:00
consumer-rules.pro	moves attachment-viewer module to library	2022-02-22 19:44:30 +01:00
proguard-rules.pro	moves attachment-viewer module to library	2022-02-22 19:44:30 +01:00