TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 16:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
session-android/libsession/src
History
jubb d05da5c447 Merge remote-tracking branch 'upstream/dev' into fix_profile_nulls 
# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt
#	app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
2021-04-29 09:39:33 +10:00
..
androidTest/java/org/session/libsession
restructure and unite service android/java to libsignal
2020-11-26 09:46:52 +11:00
main
Merge remote-tracking branch 'upstream/dev' into fix_profile_nulls
2021-04-29 09:39:33 +10:00
test/java/org/session/libsession
restructure and unite service android/java to libsignal
2020-11-26 09:46:52 +11:00