SchildiChat-android/vector-app
SpiritCroc 19881a9f70 Merge tag 'v1.5.28' into sc
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94

Conflicts:
	dependencies.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
2023-03-08 20:27:57 +01:00
..
signature Remove usage of Buildkite. 2022-11-24 14:49:55 +01:00
src Merge tag 'v1.5.24' into sc 2023-02-08 13:08:42 +01:00
build.gradle Merge tag 'v1.5.28' into sc 2023-03-08 20:27:57 +01:00
proguard-rules.pro Apply design changes to WYSIWYG editor (#7354) 2022-10-14 09:59:43 +02:00