0x330a 1b580cca1b Merge remote-tracking branch 'upstream/dev' into libsession-integration ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/BackgroundGroupAddJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/GroupAvatarDownloadJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/OpenGroupDeleteJob.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/TrimThreadJob.kt		2023-02-20 11:52:25 +11:00
..
java/org/session/libsignal	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-02-20 11:52:25 +11:00
AndroidManifest.xml	Move files	2021-05-18 09:12:33 +10:00