ariskotsomitopoulos ba99d5c028 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-26 12:49:21 +03:00
..
sampledata
signature
src	Merge branch 'develop' into feature/aris/fix_account_deactivation_issue	2022-04-26 12:49:21 +03:00
.gitignore
build.gradle	Bump libphonenumber from 8.12.46 to 8.12.47	2022-04-20 23:08:25 +00:00
lint.xml
proguard-rules.pro