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
..
attachment-viewer	Merge tag 'v1.5.24' into sc	2023-02-08 13:08:42 +01:00
core-utils	Merge tag 'v1.5.26' into sc	2023-02-23 11:55:21 +01:00
external	Bump org.json:json from 20220924 to 20230227	2023-02-28 00:01:45 +00:00
multipicker	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00
rustCrypto	Delete matrix-rust-sdk-crypto.aar from Git repo.	2023-05-03 15:23:29 +02:00
ui-strings	Merge tag 'v1.6.1' into sc	2023-05-25 12:03:56 +02:00
ui-styles	Merge tag 'v1.6.0' into sc	2023-05-22 14:19:46 +02:00