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
..
protobuf	Add profile data to message request responses	2022-10-04 15:46:32 +11:00
src/main	Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash	2023-05-30 12:25:13 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00