mirror of
https://github.com/vector-im/element-android.git
synced 2024-11-16 02:05:06 +08:00
e6e05317e1
# 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 |
||
---|---|---|
.. | ||
src/main | ||
.gitignore | ||
build.gradle | ||
consumer-rules.pro | ||
proguard-rules.pro |