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
..
sampledata	Implement poll in timeline ui.	2021-12-03 11:39:41 +03:00
signature
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
lint.xml	Remove unused resources	2022-03-09 14:55:40 +01:00
proguard-rules.pro