jubb 84fa3dfc86 Merge remote-tracking branch 'upstream/dev' into background_job_improvements ... # Conflicts: # libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt		2021-05-12 16:31:53 +10:00
..
src	Merge remote-tracking branch 'upstream/dev' into background_job_improvements	2021-05-12 16:31:53 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	feat: add contact syncing, UI improvements for profile syncing and conversation threads in the home screen	2021-03-01 17:16:15 +11:00
consumer-rules.pro	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
proguard-rules.pro	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00