SpiritCroc fe785613e7 Merge tag 'v1.5.2' into sc ... Change-Id: I0fe8262be9f2e5852815ad5f93329ffa17970b0e Conflicts: vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt vector/src/main/java/im/vector/app/features/voice/VoiceRecorderL.kt vector/src/main/res/layout/composer_layout.xml vector/src/main/res/layout/composer_layout_constraint_set_compact.xml vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml		2022-10-07 20:32:26 +02:00
..
signature	introducing vector-app module to act as the top level application	2022-08-31 09:16:00 +01:00
src	Merge tag 'v1.5.2' into sc	2022-10-07 20:32:26 +02:00
build.gradle	Merge tag 'v1.5.2' into sc	2022-10-07 20:32:26 +02:00
proguard-rules.pro	introducing vector-app module to act as the top level application	2022-08-31 09:16:00 +01:00