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
..
matrix/android/sdk	Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken	2022-03-28 15:59:50 +02:00