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
..
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 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	Merge pull request #1069 from mpretty-cyro/feature/performance-improvements	2023-01-24 13:59:32 +11:00
google-services.json	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
lint-baseline.xml	App's gradle config cleanup.	2020-11-26 12:41:59 +11:00
lint.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00