mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
6775e0afd7
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt |
||
---|---|---|
.. | ||
proguard | ||
src | ||
.gitignore | ||
build.gradle | ||
google-services.json | ||
lint-baseline.xml | ||
lint.xml |