SpiritCroc
c00600666e
Merge tag 'v1.1.9' into sc
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
2021-06-02 17:49:34 +02:00
..
2021-05-27 10:28:32 +02:00
2021-01-07 18:28:05 +01:00
2021-06-02 17:49:34 +02:00
2020-10-08 15:04:55 +02:00
2020-10-08 15:04:55 +02:00
2021-05-04 10:50:31 +02:00