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
..
docs	Package have been renamed, so also rename it here.	2022-05-20 21:14:42 +02:00
src	Merge tag 'v1.6.1' into sc	2023-05-25 12:03:56 +02:00
.gitignore	…
build.gradle	Setting version for the release 1.6.1	2023-05-25 11:05:07 +02:00
proguard-rules.pro	…