0x330a d01e27c671 Merge remote-tracking branch 'upstream/dev' into libsession-integration ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2023-01-24 16:32:07 +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 libsession-integration	2023-01-24 16:32:07 +11:00
.gitignore
build.gradle	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-01-24 16:32:07 +11:00
google-services.json
lint-baseline.xml	App's gradle config cleanup.	2020-11-26 12:41:59 +11:00
lint.xml