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
..
androidTest	Merge pull request #7290 from vector-im/feature/bca/hinder_verification	2022-10-05 14:34:34 +02:00
debug/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
main	Merge tag 'v1.5.2' into sc	2022-10-07 20:32:26 +02:00
release/java/org/matrix/android/sdk/internal/network/interceptors	Only one FormatterJsonHttpLogger implementation is required.	2022-08-24 10:11:24 +02:00
sharedTest/java/org/matrix/android/sdk/test/shared
test/java/org/matrix/android/sdk	Merge pull request #7209 from vector-im/feature/ons/extend_user_agent	2022-09-29 13:11:20 +03:00