mirror of
https://github.com/oxen-io/session-android.git
synced 2025-02-19 20:58:26 +00:00
1b580cca1b
# 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