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
..
proguard	fix: Selected message theme colours and crash fixes (#1025)	2022-10-24 15:45:26 +11:00
src	Merge remote-tracking branch 'origin/dev' into release/1.19.1	2024-08-14 10:47:16 +10:00
.gitignore
build.gradle	Merge remote-tracking branch 'origin/dev' into release/1.19.1	2024-08-14 10:47:16 +10:00
google-services.json
lint-baseline.xml
lint.xml