Onuray Sahin 1e1affbb7b Merge branch 'develop' into feature/ons/qr_code_login_ui ... # Conflicts: # library/ui-strings/src/main/res/values/strings.xml # library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt # vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt # vector/src/main/java/im/vector/app/features/VectorFeatures.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt # vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt # vector/src/main/res/layout/fragment_other_sessions.xml # vector/src/main/res/layout/fragment_settings_devices.xml		2022-10-12 14:32:09 +03:00
..
attachment-viewer	Reduce level API check, this seems not necessary.	2022-09-16 23:00:39 +02:00
core-utils	Merge branch 'develop' into dependency-cleanup	2022-05-19 12:27:09 +02:00
external	Enable Ksp for Epoxy Processor	2022-10-03 16:45:23 +02:00
multipicker	[Bugfix] Fix crash on previewing image to upload on Android P (#7184)	2022-10-04 15:34:13 +02:00
ui-strings	Merge branch 'develop' into feature/ons/qr_code_login_ui	2022-10-12 14:32:09 +03:00
ui-styles	Merge branch 'develop' into feature/ons/qr_code_login_ui	2022-10-12 14:32:09 +03:00