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

..

proguard

fix: add org.session and remove minify to release build

2021-03-16 11:45:02 +11: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

Update version number

2021-05-12 14:02:07 +10:00

google-services.json

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00

lint-baseline.xml

App's gradle config cleanup.

2020-11-26 12:41:59 +11:00

lint.xml

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00