mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java # libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java |
||
---|---|---|
.. | ||
assets | ||
java/org/thoughtcrime/securesms | ||
protobuf | ||
res | ||
AndroidManifest.xml |