Niels Andriesse f64fb68e96 Merge branch 'dev' into fix_hardcoded_strings		2021-05-24 12:52:10 +10:00
..
assets	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
java/org/thoughtcrime/securesms	Merge branch 'dev' into fix_hardcoded_strings	2021-05-24 12:52:10 +10:00
protobuf	Unused code cleanup.	2020-12-02 23:01:04 +11:00
res	Merge branch 'dev' into fix_hardcoded_strings	2021-05-24 12:52:10 +10:00
AndroidManifest.xml	Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname	2021-05-20 11:15:24 +10:00