hayaksi1 0832b7de23 Merge remote-tracking branch 'upstream/develop' into fix/7397-keep-thread-after-redaction ...

# Conflicts:
#	features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
#	features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactoryTest.kt
#	features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/RedactedVoiceMessageManagerTest.kt
#	libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/EventItemFactoryTest.kt

2026-08-27 16:27:18 +03:00

..

src

Merge remote-tracking branch 'upstream/develop' into fix/7397-keep-thread-after-redaction

2026-08-27 16:27:18 +03:00

.gitignore

…

build.gradle.kts

Move the custom tile server URL config to the Element wellknown content (#7416)

2026-08-14 08:20:37 +02:00

consumer-rules.pro

…