mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
b6ff1deb64
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # libsession-util/libsession-util # libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt # libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt # libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java # libsignal/protobuf/SignalService.proto # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java |
||
---|---|---|
.. | ||
network/loki/messenger/libsession_util |