mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-12-23 17:40:37 +03:00
190fbb95ec
# Conflicts: # vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt |
||
---|---|---|
.. | ||
java/im/vector/riotx | ||
res | ||
AndroidManifest.xml |