SchildiChat-android/vector/src
SpiritCroc f440628208 Merge tag 'v1.6.2' into sc
Change-Id: I7a9ebbae6df28044a8fa308fe34241dbd1d8b8ae

Conflicts:
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
2023-06-05 14:59:06 +02:00
..
androidTest Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464) 2023-05-24 10:14:22 +00:00
debug/res/drawable Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00
main Merge tag 'v1.6.2' into sc 2023-06-05 14:59:06 +02:00
release/res/drawable Merge tag 'v1.5.0' into merge-v1.5.0 2022-09-23 16:28:00 +02:00
sharedTest/java/im/vector/app/test/shared
test Merge tag 'v1.6.2' into sc 2023-06-05 14:59:06 +02:00