mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-23 10:05:15 +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 |
||
---|---|---|
.. | ||
protobuf | ||
src | ||
.gitignore | ||
build.gradle | ||
consumer-rules.pro | ||
proguard-rules.pro |