mirror of
https://github.com/oxen-io/session-android.git
synced 2025-03-16 14:30:53 +00:00

# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java # libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java