mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-24 16:57:50 +00:00
5a892b2932
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java # libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java