0x330a 9a7d3a45d7 Merge remote-tracking branch 'upstream/dev' into libsession-integration ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt		2023-05-26 16:04:19 +10:00
..
src	Merge remote-tracking branch 'upstream/dev' into libsession-integration	2023-05-26 16:04:19 +10:00
.gitignore	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
build.gradle	feat: setup android unit tests for verifying storage behaviours and state of shared configs	2023-04-17 18:17:03 +10:00