mirror of
https://github.com/vector-im/element-android.git
synced 2024-11-29 15:40:55 +08:00
880da9ecd5
# Conflicts: # vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt # vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt |
||
---|---|---|
.. | ||
assets | ||
java/org/matrix | ||
res | ||
AndroidManifest.xml |