Onuray Sahin
2763ebdd5a
Merge branch 'develop' into feature/ons/device_manager_filter
# Conflicts:
# vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt
# vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt