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

..

src

Merge remote-tracking branch 'upstream/dev' into disappearing-messages

2023-07-26 09:46:57 +10:00

.gitignore

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00

build.gradle

Integrate shared libsession-util library (#1096)

2023-07-14 18:27:13 +10:00