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
..
assets	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
java/org/thoughtcrime/securesms	Merge branch 'dev' into restore_log_report	2021-10-06 14:57:51 +11:00
protobuf	Unused code cleanup.	2020-12-02 23:01:04 +11:00
res	feat: finish share log dialog	2021-09-23 15:47:43 +10:00
AndroidManifest.xml	re-introduce the message detail screen	2021-07-13 16:22:10 +10:00