fanchao 50929b8970 Merge remote-tracking branch 'origin/dev' into release/1.19.1
# Conflicts:
#	app/build.gradle
#	app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
#	app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
#	gradle.properties
2024-08-14 10:47:16 +10:00
..