Morgan Pretty 5ca7f76275 Merge remote-tracking branch 'upstream/dev' into libsession-integration ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupManager.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt		2023-06-13 09:35:07 +10:00
..
proguard	fix: Selected message theme colours and crash fixes (#1025)	2022-10-24 15:45:26 +11:00
src	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-06-13 09:35:07 +10:00
.gitignore
build.gradle	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-06-13 09:35:07 +10:00
google-services.json
lint-baseline.xml
lint.xml