jubb 573760769c Merge remote-tracking branch 'upstream/dev' into fix_resources ...

# Conflicts:
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-ja/strings.xml

2021-05-18 10:09:26 +10:00

..

src

Merge remote-tracking branch 'upstream/dev' into fix_resources

2021-05-18 10:09:26 +10:00

.gitignore

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00

build.gradle

feat: add contact syncing, UI improvements for profile syncing and conversation threads in the home screen

2021-03-01 17:16:15 +11:00

consumer-rules.pro

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00

proguard-rules.pro

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00