session-android/app/src/main/java/org/thoughtcrime
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
..
securesms Merge branch 'dev' into restore_log_report 2021-10-06 14:57:51 +11:00