oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity
session-android/app/src/main/java/org
History
0x330a 7f7971e47f Merge remote-tracking branch 'upstream/dev' into disappearing-messages 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/res/layout/activity_conversation_v2_action_bar.xml
2023-07-26 09:46:57 +10:00
..
thoughtcrime/securesms Merge remote-tracking branch 'upstream/dev' into disappearing-messages 2023-07-26 09:46:57 +10:00