Merge branch 'hotfix/1.3.6'

Browse source

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

parent 6c485d5f6e edd29ec4ef

commit eb66a51891

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available