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
..
assets	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
java/org/thoughtcrime/securesms	Merge remote-tracking branch 'upstream/dev' into bluetooth-manager-crash	2023-05-30 12:25:13 +10:00
protobuf	Unused code cleanup.	2020-12-02 23:01:04 +11:00
res	Merge pull request #1205 from bemusementpark/disable-unblock	2023-05-30 10:30:51 +10:00
AndroidManifest.xml	further clean up	2023-05-10 15:36:10 +10:00