Harris 37f9ef3b1a Merge branch 'dev' into restore_log_report ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java		2021-10-06 14:57:51 +11:00
..
proguard	fix: add org.session and remove minify to release build	2021-03-16 11:45:02 +11:00
src	Merge branch 'dev' into restore_log_report	2021-10-06 14:57:51 +11:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	fix: oom from too many db instances, adding singletons to limit object creation	2021-10-04 19:02:20 +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