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
..
androidTest	refactor: instrumentation for clipboard test was failing on smaller screen devices running the tests	2021-08-31 14:21:48 +10:00
main	Merge branch 'dev' into restore_log_report	2021-10-06 14:57:51 +11:00
test	Remove unused code	2021-07-07 13:03:48 +10:00