SpiritCroc acdf419768 Merge tag 'v1.5.32' into sc ... Note: mainly conflicts in differing implementations to fix duplicate read receipts. After a quick glance at the upstream implementation, my first impression is that we likely want to keep our downstream implementation: - Better performance by checking for the more recent receipt in the SDK upon receipt receival, instead on rendering the timeline - null seems to always map to main, which caused us jumping receipts in the past, which we have addressed by now Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt vector/src/main/java/im/vector/app/features/html/PillsPostProcessor.kt Change-Id: I47ae2afe5fcbe77a4fec69374d83821b94a431de		2023-04-20 10:53:09 +02:00
..
signature	Remove usage of Buildkite.	2022-11-24 14:49:55 +01:00
src	Merge tag 'v1.5.30' into sc	2023-04-05 11:28:26 +02:00
build.gradle	Merge tag 'v1.5.32' into sc	2023-04-20 10:53:09 +02:00
proguard-rules.pro	Apply design changes to WYSIWYG editor (#7354)	2022-10-14 09:59:43 +02:00