mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-10 18:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
SchildiChat-android/vector/src/main
History
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
..
assets Replace ffmpeg-kit with libopus and libopusenc. 2022-06-15 11:34:23 +02:00
java/im/vector/app Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-13 17:20:44 +03:00
res Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-13 17:20:44 +03:00
AndroidManifest.xml Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-13 17:20:44 +03:00