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
..
debug	Ignore AlwaysShowAction lint issue. Also make it an error, so that developer has to explicitly disable the warning.	2022-09-22 16:32:14 +02:00
main	Merge branch 'develop' into feature/ons/qr_code_login_ui	2022-10-14 15:17:55 +03:00
release/res/values	Move test style Activity and layout to the new ui-style module	2021-06-15 18:17:36 +02:00