mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-23 10:05:15 +00:00
7f0962b3d4
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java # app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java # libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt |
||
---|---|---|
.. | ||
protobuf | ||
src | ||
.gitignore | ||
build.gradle | ||
consumer-rules.pro | ||
proguard-rules.pro |