jubb b685846d7e Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt # libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt # libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt # libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupMessage.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt		2021-03-18 09:26:13 +11: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 origin/refactor-sending	2021-03-18 09:26:13 +11:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Update build number	2021-03-16 13:24:40 +11: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