ariskotsomitopoulos 780f1ffc8c Merge branch 'develop' into feature/aris/fix_account_deactivation_issue ... # Conflicts: # vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt		2022-04-27 12:15:36 +03:00
..
src	Merge branch 'develop' into feature/aris/fix_account_deactivation_issue	2022-04-27 12:15:36 +03:00
.gitignore
build.gradle	Version hotfix 1.4.13	2022-04-26 11:29:40 +02:00
proguard-rules.pro