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
..
docs
src	Merge tag 'v1.6.18' into sc	2024-06-29 10:28:16 +02:00
.gitignore
build.gradle	version++	2024-05-29 12:07:55 +02:00
proguard-rules.pro