session-android/libsession/src/main
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
..
java/org/session/libsession Merge remote-tracking branch 'upstream/dev' into fix_profile_nulls 2021-04-29 09:39:33 +10:00
res e UpdateMessageBuilder to generate data extraction message 2021-04-20 16:55:46 +10:00
AndroidManifest.xml restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00