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/conversation/v2/ConversationActivityV2.kt |
||
---|---|---|
.. | ||
v2 | ||
ConversationActivity.java | ||
ConversationAdapter.java | ||
ConversationFragment.java | ||
ConversationItem.java | ||
ConversationPopupActivity.java | ||
ConversationSearchViewModel.java | ||
ConversationUpdateItem.java |