ariskotsomitopoulos b96adadf1b Merge branch 'develop' into feature/aris/fix_account_deactivation_issue ... # Conflicts: # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt # vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt		2022-04-19 11:06:43 +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-19 11:06:43 +03:00
.gitignore
build.gradle	Removing the BuildConfigField	2022-04-13 10:56:20 +02:00
lint.xml	Remove unused resources	2022-03-09 14:55:40 +01:00
proguard-rules.pro