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
..
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 fix_profile_nulls	2021-04-29 09:39:33 +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-04-14 10:51:21 +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