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
..
src	Merge branch 'develop' into feature/aris/fix_account_deactivation_issue	2022-04-19 11:06:43 +03:00
.gitignore	first commit	2018-10-03 17:58:12 +02:00
build.gradle	Remove dokka dependencies classpath for this specific module, it's already declared in the main build.gradle file.	2022-04-13 13:45:06 +02:00
proguard-rules.pro	Remove dependency to org.greenrobot.eventbus library	2021-01-05 18:56:24 +01:00