mirror of
https://github.com/element-hq/element-android
synced 2024-12-23 01:31:24 +03:00
190fbb95ec
# Conflicts: # vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt |
||
---|---|---|
.. | ||
java/im/vector/riotx | ||
res | ||
AndroidManifest.xml |