Onuray Sahin ef574bd82f 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-13 22:13:55 +01:00
..
sampledata	Add required resources.	2022-05-27 15:25:59 +03:00
src	Merge branch 'develop' into feature/ons/qr_code_login_ui	2022-10-13 22:13:55 +01:00
.gitignore
build.gradle	Integrate WYSIWYG editor (#7288)	2022-10-11 17:05:47 +02:00