Merge branch 'hotfix/1.3.6'
Conflicts: vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
This commit is contained in:
commit
eb66a51891
Conflicts: vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt