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

..

proguard

fix: add org.session and remove minify to release build

2021-03-16 11:45:02 +11:00

src

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

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

.gitignore

…

build.gradle

Update version number

2021-05-17 15:49:44 +10:00

google-services.json

…

lint-baseline.xml

App's gradle config cleanup.

2020-11-26 12:41:59 +11:00

lint.xml

…