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
..
androidTest/java/im/vector/app	Move PrivateKeysInfo to api package	2022-04-12 15:38:20 +02:00
debug	Global import optimization	2022-04-12 16:06:27 +02:00
fdroid	Move SyncService to api package	2022-04-12 15:38:20 +02:00
gplay	Rename getTimeLine to getTimeline to align naming. Also create TimelineEventDataSource.	2022-02-23 18:00:31 +01:00
main	Merge branch 'develop' into feature/aris/fix_account_deactivation_issue	2022-04-19 11:06:43 +03:00
release	Lifting debug overrides to their own abstraction (#5361)	2022-03-02 10:08:43 +00:00
sharedTest/java/im/vector/app/test/shared
test/java/im/vector/app	Move CryptoDeviceInfo to api package	2022-04-12 15:38:20 +02:00