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

..

signature

Remove usage of Buildkite.

2022-11-24 14:49:55 +01:00

src

Merge tag 'v1.6.18' into sc

2024-06-29 10:28:16 +02:00

build.gradle

Merge tag 'v1.6.18' into sc

2024-06-29 10:28:16 +02:00

proguard-rules.pro

Apply design changes to WYSIWYG editor (#7354)

2022-10-14 09:59:43 +02:00