mirror of
https://github.com/element-hq/element-android
synced 2024-10-26 20:57:20 +03:00
190fbb95ec
# Conflicts: # vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
build.gradle | ||
lint.xml | ||
proguard-rules.pro |