SpiritCroc 4573a4235e Merge tag 'v1.6.10' into sc ... Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3 Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt		2024-01-10 19:57:20 +01:00
..
src	Merge tag 'v1.6.10' into sc	2024-01-10 19:57:20 +01:00
.gitignore	…
build.gradle	Merge tag 'v1.5.4' into merge-v1.5.4	2022-10-28 18:02:53 +02:00