mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-17 20:08:32 +01:00
# 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 |
||
---|---|---|
.. | ||
sampledata | ||
src | ||
.gitignore | ||
build.gradle |