ericdecanini ce579c1dd3 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken
# Conflicts:
#	vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
2022-03-28 15:59:50 +02:00
..
2022-03-07 10:53:43 +01:00
2022-03-04 17:21:00 +03:00
2022-03-28 10:34:22 +02:00
2022-03-23 17:29:06 +00:00
2022-03-28 12:11:22 +03:00