Files
session-android/app
Harris 50c2ac60d7 Merge remote-tracking branch 'upstream/dev' into rtc_calls
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
#	app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
#	app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
2021-10-21 14:19:20 +11:00
..
2020-11-26 12:41:59 +11:00