Morgan Pretty ce3aa980aa Merge remote-tracking branch 'upstream/dev' into message-request-fixes ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt
#	libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroup.kt
#	libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt

2023-01-24 14:48:54 +11:00

..

src

Merge remote-tracking branch 'upstream/dev' into message-request-fixes

2023-01-24 14:48:54 +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