SpiritCroc 21eec091f8 Merge tag 'v1.6.18' into sc ... Change-Id: Ifc8466ddf92154fb9be05b372f234ffe26da47ba Conflicts: matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt		2024-06-29 10:28:16 +02:00
..
androidTest	When sending user mentions, always send the user id as the fallback text	2024-06-19 16:56:47 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
main	Merge tag 'v1.6.18' into sc	2024-06-29 10:28:16 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk	Accept and pass any deviceKey payload to rust	2024-06-12 09:32:27 +02:00