Commit Graph

7 Commits

Author SHA1 Message Date
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
jubb
eee3824ca0 refactor: running the remove unused resources command and cleaning up strings 2021-05-17 11:56:14 +10:00
Brice-W
f51268b587 open group invitation sending part 2021-05-12 13:41:00 +10:00
Ryan ZHAO
13f94c2cfd sync dev 2021-01-27 15:54:12 +11:00
Anton Chekulaev
e294199ea3 Master secret removed.
Screen lock related classes refactoring.
Legacy database util classes and migrations removed.
2020-12-14 18:16:16 +11:00
Anton Chekulaev
37565c74f2 Unused code cleanup. 2020-11-30 20:11:49 +11:00
Ryan ZHAO
7a66a47520 restructure and unite service android/java to libsignal 2020-11-26 09:46:52 +11:00