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
..
androidTest/java/im/vector/app	Fix tests, there is a new item in the list	2022-10-05 16:46:15 +02:00
debug	Merge branch 'develop' into feature/ons/qr_code_login_ui	2022-10-12 14:32:09 +03:00
fdroid	Fixes error	2022-10-10 11:37:39 -04:00
gplay	Merge remote-tracking branch 'origin/develop' into feature/eric/msc3881	2022-10-04 14:05:23 -04:00
main	Merge pull request #7217 from vector-im/feature/eric/msc3881	2022-10-10 12:37:47 -04:00
nightly/res/xml	lifting nightly to the application module	2022-09-15 14:50:08 +01:00
release	lifting the release build type to the application module	2022-09-15 14:50:08 +01:00