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

..

signature

introducing vector-app module to act as the top level application

2022-08-31 09:16:00 +01:00

src

Merge branch 'develop' into feature/ons/qr_code_login_ui

2022-10-12 14:32:09 +03:00

build.gradle

Bump sharetarget from 1.1.0 to 1.2.0

2022-10-05 23:14:09 +00:00

proguard-rules.pro

introducing vector-app module to act as the top level application

2022-08-31 09:16:00 +01:00