session-android/libsession/src/main/java/org/session/libsession/messaging
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
..
calls Add one on one calls over clearnet (#864) 2022-04-19 14:25:40 +10:00
contacts Add Session Id blinding (#862) 2022-08-10 18:17:48 +10:00
file_server Increased file upload limits to 10Mb 2023-02-06 14:22:26 +11:00
jobs Merge remote-tracking branch 'upstream/dev' into disappearing-messages 2023-07-26 09:46:57 +10:00
mentions Add jetpack compose 2023-06-28 10:34:48 +09:30
messages Merge remote-tracking branch 'origin/disappearing-messages' into disappearing-messages 2023-07-25 13:14:29 +10:00
open_groups Merge remote-tracking branch 'upstream/dev' into disappearing-messages 2023-07-05 22:27:59 +10:00
sending_receiving fix: compile issues 2023-07-25 17:15:54 +10:00
utilities Merge remote-tracking branch 'upstream/dev' into disappearing-messages 2023-07-26 09:46:57 +10:00
BlindedIdMapping.kt Add Session Id blinding (#862) 2022-08-10 18:17:48 +10:00
MessagingModuleConfiguration.kt Integrate shared libsession-util library (#1096) 2023-07-14 18:27:13 +10:00