jubb 045d1f5027 Merge remote-tracking branch 'upstream/dev' into rtc_calls ... # Conflicts: # app/build.gradle		2021-12-20 09:38:13 +11:00
..
file_provider_paths.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
network_security_configuration.xml	Don't use testnet	2021-07-12 14:35:22 +10:00
preferences_app_protection.xml	Merge remote-tracking branch 'upstream/dev' into rtc_calls	2021-12-20 09:38:13 +11:00
preferences_chats.xml	Implement multi device UI	2021-02-26 11:10:45 +11:00
preferences_notifications.xml	feat: extracting QR related strings and other github mentioned strings	2021-06-16 16:05:08 +10:00