mirror of
https://github.com/vector-im/element-android.git
synced 2024-11-28 15:38:14 +08:00
8647400dda
# Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt |
||
---|---|---|
.. | ||
attachment-viewer | ||
core-utils | ||
diff-match-patch | ||
jsonviewer | ||
multipicker | ||
ui-styles |