ericdecanini 4cf97d48c9 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken ... # Conflicts: # 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/auth/registration/DefaultRegistrationWizard.kt # vector/src/main/java/im/vector/app/features/login/LoginActivity.kt # vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt		2022-06-29 15:53:22 +02:00
..
docs
src	Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken	2022-06-29 15:53:22 +02:00
.gitignore
build.gradle	Prepare hotfix 1.4.25	2022-06-27 14:50:05 +02:00
proguard-rules.pro