mirror of
https://github.com/element-hq/element-android
synced 2024-11-24 02:15:35 +03:00
5953346b3d
# Conflicts: # library/ui-strings/src/main/res/values/strings.xml # matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo038.kt # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt # vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt # vector/src/main/java/im/vector/app/features/VectorFeatures.kt |
||
---|---|---|
.. | ||
attachment-viewer | ||
core-utils | ||
external | ||
multipicker | ||
ui-strings | ||
ui-styles |