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
..
docs	Package have been renamed, so also rename it here.	2022-05-20 21:14:42 +02:00
src	Merge branch 'develop' into feature/ons/qr_code_login_ui	2022-10-14 15:17:55 +03:00
.gitignore
build.gradle	Version++	2022-10-05 17:20:05 +02:00
proguard-rules.pro