Merge branch 'hotfix/1.3.6'

Conflicts:
	vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
This commit is contained in:
Benoit Marty 2021-10-26 17:30:39 +02:00
commit eb66a51891

Diff content is not available