c00600666e
Change-Id: I75baba645677d13f9937643a29630070f1470f9c Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt vector/build.gradle vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt |
||
---|---|---|
.. | ||
androidTest/java/org/matrix/android/sdk | ||
debug/java/org/matrix/android/sdk/internal/network/interceptors | ||
main | ||
release/java/org/matrix/android/sdk/internal/network/interceptors | ||
sharedTest/java/org/matrix/android/sdk/test/shared | ||
test/java/org/matrix/android/sdk |