Morgan Pretty 251df065f8 Merge remote-tracking branch 'upstream/dev' into message-request-response ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt		2023-01-24 14:44:56 +11: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 message-request-response	2023-01-24 14:44:56 +11:00
protobuf	Unused code cleanup.	2020-12-02 23:01:04 +11:00
res	Merge remote-tracking branch 'upstream/dev' into feature/read_status_updates	2023-01-24 14:10:14 +11:00
AndroidManifest.xml	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00