Onuray Sahin 5953346b3d Merge branch 'develop' into feature/ons/qr_code_login_ui ...

# 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

2022-10-14 15:17:55 +03:00

..

src

Merge branch 'develop' into feature/ons/qr_code_login_ui

2022-10-14 15:17:55 +03:00

.gitignore

Create module for ui-styles

2021-06-15 12:23:54 +02:00

build.gradle

moving external library modules to an external directory

2022-09-16 15:15:32 +01:00