You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-android/libsession
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
5 years ago
..
src Merge remote-tracking branch 'upstream/dev' into fix_profile_nulls 5 years ago
.gitignore restructure and unite service android/java to libsignal 5 years ago
build.gradle feat: add contact syncing, UI improvements for profile syncing and conversation threads in the home screen 5 years ago
consumer-rules.pro restructure and unite service android/java to libsignal 5 years ago
proguard-rules.pro restructure and unite service android/java to libsignal 5 years ago