ericdecanini
b12549831e
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/db/SessionParamsMapper.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
# vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
2022-05-17 14:24:35 +02:00
..
2021-06-18 21:33:50 +02:00
2022-05-04 13:03:46 +03:00
2022-03-07 10:53:43 +01:00
2022-04-26 17:30:20 +02:00
2022-04-26 17:31:01 +02:00
2022-04-24 19:33:11 +01:00
2022-05-16 12:23:10 +02:00
2022-05-12 18:45:35 +02:00
2022-05-03 15:17:20 +03:00
2022-05-12 15:43:20 +02:00
2022-05-04 13:56:15 -04:00
2022-05-05 12:06:55 +02:00
2022-05-05 19:16:53 +02:00
2022-05-06 12:16:10 +03:00
2022-05-06 16:38:40 +01:00
2022-05-09 11:54:59 +01:00
2022-05-10 13:18:12 -06:00
2022-05-12 22:56:09 +02:00
2022-05-13 14:00:32 +02:00
2022-05-05 14:02:11 +02:00