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
..
sampledata	Split sample step 3: rooms and spaces	2021-05-10 23:07:08 +02:00
signature
src	Merge tag 'v1.1.9' into sc	2021-06-02 17:49:34 +02:00
.gitignore	Update .gitignore for gplay builds	2020-08-09 17:02:51 +02:00
build.gradle	Merge tag 'v1.1.9' into sc	2021-06-02 17:49:34 +02:00
lint.xml	Ignore lint false positive	2021-05-18 21:23:50 +02:00
proguard-rules.pro	Initial commit jitsi	2020-08-14 09:31:24 +02:00