Morgan Pretty f63ad7e034 Merge remote-tracking branch 'upstream/dev' into libsession-integration ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java # app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt # app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt		2023-06-06 15:44:24 +10:00
..
java/org/thoughtcrime/securesms	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-06-06 15:44:24 +10:00
resources/data	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00