mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
7f7971e47f
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/res/layout/activity_conversation_v2_action_bar.xml |
||
---|---|---|
.. | ||
calls | ||
contacts | ||
file_server | ||
jobs | ||
mentions | ||
messages | ||
open_groups | ||
sending_receiving | ||
utilities | ||
BlindedIdMapping.kt | ||
MessagingModuleConfiguration.kt |