SpiritCroc 9614f5994d Merge tag 'v1.6.1' into sc ... Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt		2023-05-25 12:03:56 +02:00
..
sampledata
src	Merge tag 'v1.6.1' into sc	2023-05-25 12:03:56 +02:00
.gitignore
build.gradle	Merge tag 'v1.6.0' into sc	2023-05-22 14:19:46 +02:00