ariskotsomitopoulos ba99d5c028 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-26 12:49:21 +03:00
..
assets	Remove 3rd party waveform library.	2022-03-02 17:46:09 +03:00
java/im/vector/app	Merge branch 'develop' into feature/aris/fix_account_deactivation_issue	2022-04-26 12:49:21 +03:00
res	Add a TODO for next Weblate sync	2022-04-25 09:48:35 +02:00
AndroidManifest.xml	Create a foreground service during screen sharing.	2022-04-20 13:33:35 +03:00