mirror of
https://github.com/oxen-io/session-android.git
synced 2025-04-22 10:31:28 +00:00

# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt