SchildiChat-android/library
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
..
attachment-viewer Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 2022-05-31 14:21:16 +02:00
core-utils Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
diff-match-patch
jsonviewer Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
multipicker Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-18 11:47:21 +02:00
ui-styles Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet 2022-05-30 21:07:25 +03:00