SchildiChat-android/vector
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
2022-09-13 17:20:44 +03:00
..
sampledata
src Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-13 17:20:44 +03:00
.gitignore
build.gradle Use firebaseReceiver with FCM 2022-09-07 18:02:26 +02:00