TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 11:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
01fef6a0a4
session-android/libsignal/src
History
0x330a d5e4e6b7cd Merge remote-tracking branch 'upstream/dev' into libsession-integration 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
#	app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
#	libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
2023-03-31 13:41:41 +11:00
..
main Merge remote-tracking branch 'upstream/dev' into libsession-integration 2023-03-31 13:41:41 +11:00