Morgan Pretty c77d465438 Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt # app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt		2023-05-30 12:25:13 +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 'upstream/dev' into bluetooth-manager-crash	2023-05-30 12:25:13 +10:00
.gitignore
build.gradle	build: update build number	2023-04-05 16:32:16 +10:00
google-services.json
lint-baseline.xml	App's gradle config cleanup.	2020-11-26 12:41:59 +11:00
lint.xml