Morgan Pretty 796fdc6d1b Merge remote-tracking branch 'upstream/dev' into libsession-integration ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt		2023-05-31 14:48:46 +10:00
..
java/org/session/libsignal	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-05-31 14:48:46 +10:00
AndroidManifest.xml	Move files	2021-05-18 09:12:33 +10:00