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
..
src	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-05-31 14:48:46 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	feat: setup android unit tests for verifying storage behaviours and state of shared configs	2023-04-17 18:17:03 +10:00