SchildiChat-android/vector-app/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/java/im/vector/app UI tests are disabled on CI 2023-03-29 10:00:32 +02:00
debug Merge tag 'v1.6.0' into sc 2023-05-22 14:19:46 +02:00
fdroid Merge tag 'v1.6.0' into sc 2023-05-22 14:19:46 +02:00
fdroidRustCryptoNightly/res/values remove app_name from resource 2023-03-15 09:20:03 +01:00
gplay Merge tag 'v1.6.2' into sc 2023-06-05 14:59:06 +02:00
main Merge tag 'v1.6.0' into sc 2023-05-22 14:19:46 +02:00
nightly/res remove app_name from resource 2023-03-15 09:20:03 +01:00
release remove app_name from resource 2023-03-15 09:20:03 +01:00