jubb de2e241598 Merge branch 'master' into calls ... # Conflicts: # app/build.gradle		2022-03-22 11:59:39 +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 'origin/calls' into calls	2022-03-17 17:32:32 +11:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Merge branch 'master' into calls	2022-03-22 11:59:39 +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