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
..
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 message-request-response	2023-01-24 14:44:56 +11: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