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
..
androidTest/java/im/vector/app	Access the various services with a getter	2022-04-25 09:49:51 +02:00
debug	Merge branch 'develop' into feature/ons/voip_screen_sharing_permission	2022-04-21 15:16:04 +03:00
fdroid	Formats entire project	2022-04-21 11:50:15 +02:00
gplay	Access the various services with a getter	2022-04-25 09:49:51 +02:00
main	Merge branch 'develop' into feature/aris/fix_account_deactivation_issue	2022-04-27 12:15:36 +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	Access the various services with a getter	2022-04-25 09:49:51 +02:00